Remove patch version from namespace

examples/conform.cpp

@@ -28,7 +28,7 @@
 
 #include <iostream>
 
-namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 // Look for media with this name in this folder.
 std::string find_matching_media(std::string const& name, std::string const& folder)

examples/flatten_video_tracks.cpp

@@ -9,7 +9,7 @@
 #include <iostream>
 #include <sstream>
 
-namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 int main(int argc, char** argv)
 {

examples/io_perf_test.cpp

@@ -11,7 +11,7 @@
 
 #include "util.h"
 
-namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 using chrono_time_point = std::chrono::steady_clock::time_point;
 

examples/python_adapters_child_process.cpp

@@ -30,7 +30,7 @@
 #include <stdio.h>
 #endif // _WINDOWS
 
-namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 class PythonAdapters
 {

examples/python_adapters_embed.cpp

@@ -27,7 +27,7 @@
 #include <combaseapi.h>
 #endif // _WINDOWS
 
-namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 class PythonAdapters
 {

examples/summarize_timing.cpp

@@ -17,8 +17,8 @@
 
 #include <iostream>
 
-namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
-namespace otime = opentime::OPENTIME_VERSION;
+namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
+namespace otime = opentime::OPENTIME_VERSION_NS;
 
 void summarize_effects(otio::SerializableObject::Retainer<otio::Item> const& item)
 {

examples/upgrade_downgrade_example.cpp

@@ -8,7 +8,7 @@
 // demonstrates a minimal custom SerializableObject written in C++ with upgrade
 // and downgrade functions
 
-namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 // define the custom class
 class SimpleClass : public otio::SerializableObject

examples/util.cpp

@@ -29,7 +29,7 @@
 #include <unistd.h>
 #endif // _WINDOWS
 
-namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 namespace examples {
 

examples/util.h

@@ -22,6 +22,6 @@ std::string create_temp_dir();
 std::vector<std::string> glob(std::string const& path, std::string const& pattern);
 
 // Print an error to std::cerr.
-void print_error(opentimelineio::OPENTIMELINEIO_VERSION::ErrorStatus const&);
+void print_error(opentimelineio::OPENTIMELINEIO_VERSION_NS::ErrorStatus const&);
 
 }

src/opentime/errorStatus.cpp

@@ -3,7 +3,7 @@
 
 #include "opentime/errorStatus.h"
 
-namespace opentime { namespace OPENTIME_VERSION {
+namespace opentime { namespace OPENTIME_VERSION_NS {
 
 std::string
 ErrorStatus::outcome_to_string(Outcome o)
@@ -29,4 +29,4 @@ ErrorStatus::outcome_to_string(Outcome o)
     };
 }
 
-}} // namespace opentime::OPENTIME_VERSION
+}} // namespace opentime::OPENTIME_VERSION_NS

src/opentime/errorStatus.h

@@ -7,7 +7,7 @@
 #include "opentime/version.h"
 #include <string>
 
-namespace opentime { namespace OPENTIME_VERSION {
+namespace opentime { namespace OPENTIME_VERSION_NS {
 
 /// @brief This struct represents the return status of a function.
 struct OPENTIME_API_TYPE ErrorStatus
@@ -65,4 +65,4 @@ is_error(const ErrorStatus* es) noexcept
     return es && ErrorStatus::Outcome::OK != es->outcome;
 }
 
-}} // namespace opentime::OPENTIME_VERSION
+}} // namespace opentime::OPENTIME_VERSION_NS

src/opentime/rationalTime.cpp

@@ -9,7 +9,7 @@
 #include <cmath>
 #include <vector>
 
-namespace opentime { namespace OPENTIME_VERSION {
+namespace opentime { namespace OPENTIME_VERSION_NS {
 
 RationalTime RationalTime::_invalid_time{ 0, RationalTime::_invalid_rate };
 
@@ -661,4 +661,4 @@ RationalTime::to_time_string() const
         microseconds_str.c_str());
 }
 
-}} // namespace opentime::OPENTIME_VERSION
+}} // namespace opentime::OPENTIME_VERSION_NS

src/opentime/rationalTime.h

@@ -10,7 +10,7 @@
 #include <limits>
 #include <string>
 
-namespace opentime { namespace OPENTIME_VERSION {
+namespace opentime { namespace OPENTIME_VERSION_NS {
 
 /// @brief This enumeration provides options for drop frame timecode.
 enum OPENTIME_API_TYPE IsDropFrameRate : int
@@ -423,4 +423,4 @@ class OPENTIME_API_TYPE RationalTime
     }
 };
 
-}} // namespace opentime::OPENTIME_VERSION
+}} // namespace opentime::OPENTIME_VERSION_NS

src/opentime/stringPrintf.h

@@ -8,7 +8,7 @@
 #include <memory>
 #include <string>
 
-namespace opentime { namespace OPENTIME_VERSION {
+namespace opentime { namespace OPENTIME_VERSION_NS {
 
 /// @brief This provides printf style functionality for std::string.
 template <typename... Args>
@@ -27,4 +27,4 @@ string_printf(char const* format, Args... args)
     return std::string(buf.get());
 }
 
-}} // namespace opentime::OPENTIME_VERSION
+}} // namespace opentime::OPENTIME_VERSION_NS

src/opentime/timeRange.h

@@ -8,7 +8,7 @@
 #include <algorithm>
 #include <string>
 
-namespace opentime { namespace OPENTIME_VERSION {
+namespace opentime { namespace OPENTIME_VERSION_NS {
 
 /// @brief This default epsilon_s value is used in comparison between floating numbers.
 ///
@@ -460,4 +460,4 @@ class OPENTIME_API_TYPE TimeRange
     }
 };
 
-}} // namespace opentime::OPENTIME_VERSION
+}} // namespace opentime::OPENTIME_VERSION_NS

src/opentime/timeTransform.h

@@ -8,7 +8,7 @@
 #include "opentime/version.h"
 #include <string>
 
-namespace opentime { namespace OPENTIME_VERSION {
+namespace opentime { namespace OPENTIME_VERSION_NS {
 
 /// @brief One-dimensional time transform.
 class OPENTIME_API_TYPE TimeTransform
@@ -82,4 +82,4 @@ class OPENTIME_API_TYPE TimeTransform
     double       _rate;
 };
 
-}} // namespace opentime::OPENTIME_VERSION
+}} // namespace opentime::OPENTIME_VERSION_NS

src/opentime/version.h.in

@@ -7,10 +7,11 @@
 #define OPENTIME_VERSION_MINOR @PROJECT_VERSION_MINOR@
 #define OPENTIME_VERSION_PATCH @PROJECT_VERSION_PATCH@
 #define OPENTIME_VERSION v@PROJECT_VERSION_MAJOR@_@PROJECT_VERSION_MINOR@_@PROJECT_VERSION_PATCH@
+#define OPENTIME_VERSION_NS v@PROJECT_VERSION_MAJOR@_@PROJECT_VERSION_MINOR@
 
 namespace opentime {
-namespace OPENTIME_VERSION {
+namespace OPENTIME_VERSION_NS {
 }
 
-using namespace OPENTIME_VERSION;
+using namespace OPENTIME_VERSION_NS;
 } // namespace opentime

src/opentimelineio/CORE_VERSION_MAP.cpp

@@ -12,7 +12,7 @@
 // version of an older library.
 #include "opentimelineio/typeRegistry.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 const label_to_schema_version_map CORE_VERSION_MAP{
     { "0.14.0",
@@ -241,4 +241,4 @@ const label_to_schema_version_map CORE_VERSION_MAP{
     // {next}
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS

src/opentimelineio/CORE_VERSION_MAP.last.cpp

@@ -12,7 +12,7 @@
 // version of an older library.
 #include "opentimelineio/typeRegistry.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 const label_to_schema_version_map CORE_VERSION_MAP{
     { "0.14.0",
@@ -209,4 +209,4 @@ const label_to_schema_version_map CORE_VERSION_MAP{
     // {next}
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS

src/opentimelineio/algo/editAlgorithm.cpp

@@ -11,12 +11,12 @@
 #include "opentimelineio/track.h"
 #include "opentimelineio/transition.h"
 
-namespace otime = opentime::OPENTIME_VERSION;
+namespace otime = opentime::OPENTIME_VERSION_NS;
 
 using otime::RationalTime;
 using otime::TimeRange;
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION { namespace algo {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS { namespace algo {
 
 
 #include <iostream>
@@ -883,4 +883,4 @@ void remove(
     }
 }
 
-}}} // namespace opentimelineio::OPENTIMELINEIO_VERSION::algo
+}}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS::algo

src/opentimelineio/algo/editAlgorithm.h

@@ -5,7 +5,7 @@
 
 #include "opentimelineio/composition.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION { namespace algo {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS { namespace algo {
 
 //! Enum used by 3/4 Point Edit (aka. as fill)
 enum class ReferencePoint
@@ -214,4 +214,4 @@ OTIO_API void remove(
     Item*               fill_template = nullptr,
     ErrorStatus*        error_status = nullptr);
 
-}}} // namespace opentimelineio::OPENTIMELINEIO_VERSION::algo
+}}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS::algo

src/opentimelineio/anyDictionary.h

@@ -11,7 +11,7 @@
 #include <map>
 #include <string>
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @brief This class provides a replacement for "std::map<std::string, std::any>".
 ///
@@ -290,4 +290,4 @@ class OTIO_API_TYPE AnyDictionary : private std::map<std::string, std::any>
     }
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS

src/opentimelineio/anyVector.h

@@ -10,7 +10,7 @@
 #include <assert.h>
 #include <vector>
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @brief This class provides a replacement for "std::vector<std::any>".
 ///
@@ -176,4 +176,4 @@ class OTIO_API_TYPE AnyVector : private std::vector<std::any>
     MutationStamp* _mutation_stamp = nullptr;
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS

src/opentimelineio/clip.cpp

@@ -4,7 +4,7 @@
 #include "opentimelineio/clip.h"
 #include "opentimelineio/missingReference.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 char constexpr Clip::default_media_key[];
 
@@ -224,4 +224,4 @@ Clip::available_image_bounds(ErrorStatus* error_status) const
     return active_media->available_image_bounds();
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS

src/opentimelineio/clip.h

@@ -7,7 +7,7 @@
 #include "opentimelineio/mediaReference.h"
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @brief A clip is a segment of editable media (usually audio or video).
 ///
@@ -106,4 +106,4 @@ class OTIO_API_TYPE Clip : public Item
     std::string                                     _active_media_reference_key;
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS

src/opentimelineio/color.cpp

@@ -6,7 +6,7 @@
 
 #include "opentimelineio/color.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 Color::Color(
     double const       r,
@@ -177,4 +177,4 @@ Color::to_rgba_float_list()
     return { _r, _g, _b, _a };
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS

src/opentimelineio/color.h

@@ -9,7 +9,7 @@
 #include "opentimelineio/export.h"
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @brief Color consists of red, green, blue,
 /// and alpha double floating point values,
@@ -88,4 +88,4 @@ class OTIO_API_TYPE Color
     std::string _name;
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS

src/opentimelineio/composable.cpp

@@ -4,7 +4,7 @@
 #include "opentimelineio/composable.h"
 #include "opentimelineio/composition.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 Composable::Composable(std::string const& name, AnyDictionary const& metadata)
     : Parent(name, metadata)
@@ -81,4 +81,4 @@ Composable::available_image_bounds(ErrorStatus* error_status) const
     return std::optional<IMATH_NAMESPACE::Box2d>();
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS

src/opentimelineio/composable.h

@@ -8,7 +8,7 @@
 
 #include <Imath/ImathBox.h>
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 class Composition;
 
@@ -68,4 +68,4 @@ class OTIO_API_TYPE Composable : public SerializableObjectWithMetadata
     friend class Composition;
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS