Skip to content

Commit 257c1b4

Browse files
committed
Remove patch version from namespace
Signed-off-by: Darby Johnston <[email protected]>
1 parent ad449d8 commit 257c1b4

File tree

99 files changed

+191
-189
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+191
-189
lines changed

examples/conform.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#include <iostream>
3030

31-
namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
31+
namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
3232

3333
// Look for media with this name in this folder.
3434
std::string find_matching_media(std::string const& name, std::string const& folder)

examples/flatten_video_tracks.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <iostream>
1010
#include <sstream>
1111

12-
namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
12+
namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
1313

1414
int main(int argc, char** argv)
1515
{

examples/io_perf_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include "util.h"
1313

14-
namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
14+
namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
1515

1616
using chrono_time_point = std::chrono::steady_clock::time_point;
1717

examples/python_adapters_child_process.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include <stdio.h>
3131
#endif // _WINDOWS
3232

33-
namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
33+
namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
3434

3535
class PythonAdapters
3636
{

examples/python_adapters_embed.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <combaseapi.h>
2828
#endif // _WINDOWS
2929

30-
namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
30+
namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
3131

3232
class PythonAdapters
3333
{

examples/summarize_timing.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
#include <iostream>
1919

20-
namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
21-
namespace otime = opentime::OPENTIME_VERSION;
20+
namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
21+
namespace otime = opentime::OPENTIME_VERSION_NS;
2222

2323
void summarize_effects(otio::SerializableObject::Retainer<otio::Item> const& item)
2424
{

examples/upgrade_downgrade_example.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// demonstrates a minimal custom SerializableObject written in C++ with upgrade
99
// and downgrade functions
1010

11-
namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
11+
namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
1212

1313
// define the custom class
1414
class SimpleClass : public otio::SerializableObject

examples/util.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <unistd.h>
3030
#endif // _WINDOWS
3131

32-
namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
32+
namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
3333

3434
namespace examples {
3535

examples/util.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ std::string create_temp_dir();
2222
std::vector<std::string> glob(std::string const& path, std::string const& pattern);
2323

2424
// Print an error to std::cerr.
25-
void print_error(opentimelineio::OPENTIMELINEIO_VERSION::ErrorStatus const&);
25+
void print_error(opentimelineio::OPENTIMELINEIO_VERSION_NS::ErrorStatus const&);
2626

2727
}

src/opentime/errorStatus.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "opentime/errorStatus.h"
55

6-
namespace opentime { namespace OPENTIME_VERSION {
6+
namespace opentime { namespace OPENTIME_VERSION_NS {
77

88
std::string
99
ErrorStatus::outcome_to_string(Outcome o)
@@ -29,4 +29,4 @@ ErrorStatus::outcome_to_string(Outcome o)
2929
};
3030
}
3131

32-
}} // namespace opentime::OPENTIME_VERSION
32+
}} // namespace opentime::OPENTIME_VERSION_NS

0 commit comments

Comments
 (0)