Usd std::any and std::optional

Signed-off-by: Darby Johnston <[email protected]>
AcademySoftwareFoundation · Mar 27, 2024 · 4efd3dc · 4efd3dc
1 parent afcb552
commit 4efd3dc
Show file tree

Hide file tree

Showing 54 changed files with 579 additions and 614 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,15 +1,9 @@
-[submodule "src/deps/optional-lite"]
-	path = src/deps/optional-lite
-	url = https://github.com/martinmoene/optional-lite
 [submodule "src/deps/pybind11"]
 	path = src/deps/pybind11
 	url = https://github.com/pybind/pybind11.git
 [submodule "src/deps/rapidjson"]
 	path = src/deps/rapidjson
 	url = https://github.com/Tencent/rapidjson.git
-[submodule "src/deps/any"]
-	path = src/deps/any
-	url = https://github.com/thelink2012/any.git
 [submodule "src/deps/Imath"]
 	path = src/deps/Imath
 	url = https://github.com/AcademySoftwareFoundation/Imath
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -142,7 +142,7 @@ endif()
 # Global language settings
 
 if (NOT CMAKE_CXX_STANDARD)
-    set(CMAKE_CXX_STANDARD 14)
+    set(CMAKE_CXX_STANDARD 17)
 endif()
 
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

diff --git a/src/deps/CMakeLists.txt b/src/deps/CMakeLists.txt
@@ -4,7 +4,7 @@
 #----- Other dependencies
 
 # detect if the submodules haven't been updated
-set(DEPS_SUBMODULES any optional-lite pybind11 rapidjson)
+set(DEPS_SUBMODULES pybind11 rapidjson)
 foreach(submodule IN LISTS DEPS_SUBMODULES)
     file(GLOB SUBMOD_CONTENTS ${submodule})
     list(LENGTH SUBMOD_CONTENTS SUBMOD_CONTENT_LEN)
@@ -20,13 +20,6 @@ if(OTIO_PYTHON_INSTALL)
     add_subdirectory(pybind11)
 endif()
 
-if(OTIO_CXX_INSTALL AND OTIO_DEPENDENCIES_INSTALL)
-    install(FILES any/any.hpp 
-            DESTINATION "${OTIO_RESOLVED_CXX_INSTALL_DIR}/include/opentimelineio/deps/any")
-    install(FILES optional-lite/include/nonstd/optional.hpp
-    	    DESTINATION "${OTIO_RESOLVED_CXX_INSTALL_DIR}/include/opentimelineio/deps/nonstd")
-endif()
-
 if (USE_DEPS_IMATH)
     # preserve BUILD_SHARED_LIBS options for this project, but set it off for Imath
     option(BUILD_SHARED_LIBS "Build shared libraries" ON)

diff --git a/src/deps/any b/src/deps/any
diff --git a/src/deps/optional-lite b/src/deps/optional-lite
diff --git a/src/opentimelineio/CMakeLists.txt b/src/opentimelineio/CMakeLists.txt
@@ -2,7 +2,6 @@
 # opentimelineio/CMakeLists.txt
 
 set(OPENTIMELINEIO_HEADER_FILES
-    any.h
     anyDictionary.h
     anyVector.h
     clip.h
@@ -22,7 +21,6 @@ set(OPENTIMELINEIO_HEADER_FILES
     marker.h
     mediaReference.h
     missingReference.h
-    optional.h
     safely_typed_any.h
     serializableCollection.h
     serializableObject.h
@@ -83,7 +81,6 @@ target_include_directories(opentimelineio
     PRIVATE       "${IMATH_INCLUDES}"
                   "${PROJECT_SOURCE_DIR}/src"
                   "${PROJECT_SOURCE_DIR}/src/deps"
-                  "${PROJECT_SOURCE_DIR}/src/deps/optional-lite/include"
                   "${PROJECT_SOURCE_DIR}/src/deps/rapidjson/include"
                   "${IMATH_INCLUDES}")
 

diff --git a/src/opentimelineio/any.h b/src/opentimelineio/any.h
diff --git a/src/opentimelineio/anyDictionary.h b/src/opentimelineio/anyDictionary.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include "opentimelineio/any.h"
 #include "opentimelineio/version.h"
 
+#include <any>
 #include <assert.h>
 #include <map>
 #include <string>
@@ -14,7 +14,7 @@ namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
 
 /**
  * An AnyDictionary has exactly the same API as
- *    std::map<std::string, any>
+ *    std::map<std::string, std::any>
  *
  * except that it records a "time-stamp" that bumps monotonically every time an
  * operation that would invalidate iterators is performed.
@@ -26,7 +26,7 @@ namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
  * and take steps to safe-guard themselves from causing a crash.  (Yes,
  * I'm talking to you, Python...)
  */
-class AnyDictionary : private std::map<std::string, any>
+class AnyDictionary : private std::map<std::string, std::any>
 {
 public:
     using map::map;
@@ -125,7 +125,7 @@ class AnyDictionary : private std::map<std::string, any>
     /// @TODO: remove all of these @{
 
     // if key is in this, and the type of key matches the type of result, then
-    // set result to the value of any_cast<type>(this[key]) and return true,
+    // set result to the value of std::any_cast<type>(this[key]) and return true,
     // otherwise return false
     template <typename containedType>
     bool get_if_set(const std::string& key, containedType* result) const
@@ -141,7 +141,7 @@ class AnyDictionary : private std::map<std::string, any>
             && (it->second.type().hash_code()
                 == typeid(containedType).hash_code()))
         {
-            *result = any_cast<containedType>(it->second);
+            *result = std::any_cast<containedType>(it->second);
             return true;
         }
         else
@@ -171,7 +171,7 @@ class AnyDictionary : private std::map<std::string, any>
             && (d_it->second.type().hash_code()
                 == typeid(containedType).hash_code()))
         {
-            *result = any_cast<containedType>(d_it->second);
+            *result = std::any_cast<containedType>(d_it->second);
             return true;
         }
         else

diff --git a/src/opentimelineio/anyVector.h b/src/opentimelineio/anyVector.h
@@ -3,16 +3,17 @@
 
 #pragma once
 
-#include "opentimelineio/any.h"
 #include "opentimelineio/version.h"
+
+#include <any>
 #include <assert.h>
 #include <vector>
 
 namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
 
 /**
  * An AnyVector has exactly the same API as
- *    std::vector<any>
+ *    std::vector<std::any>
  *
  * except that it records a "time-stamp" that
  * lets external observers know when the vector has been destroyed (which includes
@@ -22,7 +23,7 @@ namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
  * and take steps to safe-guard themselves from causing a crash.
  */
 
-class AnyVector : private std::vector<any>
+class AnyVector : private std::vector<std::any>
 {
 public:
     using vector::vector;

diff --git a/src/opentimelineio/clip.cpp b/src/opentimelineio/clip.cpp
@@ -9,11 +9,11 @@ namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
 char constexpr Clip::default_media_key[];
 
 Clip::Clip(
-    std::string const&         name,
-    MediaReference*            media_reference,
-    optional<TimeRange> const& source_range,
-    AnyDictionary const&       metadata,
-    std::string const&         active_media_reference_key)
+    std::string const&              name,
+    MediaReference*                 media_reference,
+    std::optional<TimeRange> const& source_range,
+    AnyDictionary const&            metadata,
+    std::string const&              active_media_reference_key)
     : Parent{ name, source_range, metadata }
     , _active_media_reference_key(active_media_reference_key)
 {
@@ -184,7 +184,7 @@ Clip::available_range(ErrorStatus* error_status) const
     return active_media->available_range().value();
 }
 
-optional<IMATH_NAMESPACE::Box2d>
+std::optional<IMATH_NAMESPACE::Box2d>
 Clip::available_image_bounds(ErrorStatus* error_status) const
 {
     auto active_media = media_reference();
@@ -194,7 +194,7 @@ Clip::available_image_bounds(ErrorStatus* error_status) const
             ErrorStatus::CANNOT_COMPUTE_BOUNDS,
             "No image bounds set on clip",
             this);
-        return optional<IMATH_NAMESPACE::Box2d>();
+        return std::optional<IMATH_NAMESPACE::Box2d>();
     }
 
     if (!active_media->available_image_bounds())
@@ -203,7 +203,7 @@ Clip::available_image_bounds(ErrorStatus* error_status) const
             ErrorStatus::CANNOT_COMPUTE_BOUNDS,
             "No image bounds set on media reference on clip",
             this);
-        return optional<IMATH_NAMESPACE::Box2d>();
+        return std::optional<IMATH_NAMESPACE::Box2d>();
     }
 
     return active_media->available_image_bounds();

diff --git a/src/opentimelineio/clip.h b/src/opentimelineio/clip.h
@@ -23,11 +23,11 @@ class Clip : public Item
     using Parent = Item;
 
     Clip(
-        std::string const&         name               = std::string(),
-        MediaReference*            media_reference    = nullptr,
-        optional<TimeRange> const& source_range       = nullopt,
-        AnyDictionary const&       metadata           = AnyDictionary(),
-        std::string const& active_media_reference_key = default_media_key);
+        std::string const&              name                       = std::string(),
+        MediaReference*                 media_reference            = nullptr,
+        std::optional<TimeRange> const& source_range               = std::nullopt,
+        AnyDictionary const&            metadata                   = AnyDictionary(),
+        std::string const&              active_media_reference_key = default_media_key);
 
     void            set_media_reference(MediaReference* media_reference);
     MediaReference* media_reference() const noexcept;
@@ -48,7 +48,7 @@ class Clip : public Item
     TimeRange
     available_range(ErrorStatus* error_status = nullptr) const override;
 
-    optional<IMATH_NAMESPACE::Box2d>
+    std::optional<IMATH_NAMESPACE::Box2d>
     available_image_bounds(ErrorStatus* error_status) const override;
 
 protected:

diff --git a/src/opentimelineio/composable.cpp b/src/opentimelineio/composable.cpp
@@ -74,11 +74,11 @@ Composable::duration(ErrorStatus* error_status) const
     return RationalTime();
 }
 
-optional<IMATH_NAMESPACE::Box2d>
+std::optional<IMATH_NAMESPACE::Box2d>
 Composable::available_image_bounds(ErrorStatus* error_status) const
 {
     *error_status = ErrorStatus::NOT_IMPLEMENTED;
-    return optional<IMATH_NAMESPACE::Box2d>();
+    return std::optional<IMATH_NAMESPACE::Box2d>();
 }
 
 }} // namespace opentimelineio::OPENTIMELINEIO_VERSION
diff --git a/src/opentimelineio/composable.h b/src/opentimelineio/composable.h
@@ -34,7 +34,7 @@ class Composable : public SerializableObjectWithMetadata
 
     virtual RationalTime duration(ErrorStatus* error_status = nullptr) const;
 
-    virtual optional<IMATH_NAMESPACE::Box2d>
+    virtual std::optional<IMATH_NAMESPACE::Box2d>
     available_image_bounds(ErrorStatus* error_status) const;
 
 protected: