Fix compilation

Signed-off-by: vade <vade@vade.info>
OpenTimelineIO · Sep 25, 2024 · 91fadb1 · 91fadb1
1 parent b3abf2c
commit 91fadb1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/Sources/objc/include/CxxAny.h b/Sources/objc/include/CxxAny.h
@@ -7,13 +7,6 @@
 
 #import "opentime.h"
 
-#if defined(__cplusplus)
-#import <any/any.hpp>
-#import "opentimelineio.h"
-namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
-#endif
-
-
 typedef union CxxAnyValue {
     bool b;
     int64_t i;
@@ -46,6 +39,7 @@ typedef struct CxxAny {
 } CxxAny;
 
 #if defined(__cplusplus)
+#import <any>
 void otio_any_to_cxx_any(std::any const&, CxxAny*);
 std::any cxx_any_to_otio_any(CxxAny const&);
 #endif
diff --git a/Sources/objc/include/CxxAnyDictionaryIterator.h b/Sources/objc/include/CxxAnyDictionaryIterator.h
@@ -6,6 +6,7 @@
 // Copyright Contributors to the OpenTimelineIO project
 
 #import <Foundation/Foundation.h>
+#import "CxxAny.h"
 #import "opentime.h"
 #import "CxxAnyDictionaryMutationStamp.h"
 

diff --git a/Sources/objc/opentimelineio.mm b/Sources/objc/opentimelineio.mm
@@ -357,7 +357,7 @@ void item_set_source_range(CxxRetainer* self , CxxTimeRange tr) {
 
 void item_set_source_range_to_null(CxxRetainer* self) {
     auto item = SO_cast<otio::Item>(self);
-    item->set_source_range(otio::optional<otio::TimeRange>());
+    item->set_source_range(std::optional<otio::TimeRange>());
 }
 
 CxxTimeRange item_available_range(CxxRetainer* self, CxxErrorStruct* cxxErr) {
@@ -628,7 +628,7 @@ void media_reference_set_available_range(CxxRetainer* self, CxxTimeRange tr) {
 }
 
 void media_reference_clear_available_range(CxxRetainer* self) {
-    SO_cast<otio::MediaReference>(self)->set_available_range(otio::nullopt);
+    SO_cast<otio::MediaReference>(self)->set_available_range(std::nullopt);
 }
 
 // MARK: - Timeline
@@ -655,7 +655,7 @@ void timeline_set_global_start_time(CxxRetainer* self, CxxRationalTime rt) {
 }
 
 void timeline_clear_global_start_time(CxxRetainer* self) {
-    SO_cast<otio::Timeline>(self)->set_global_start_time(otio::nullopt);
+    SO_cast<otio::Timeline>(self)->set_global_start_time(std::nullopt);
 }
 
 CxxRationalTime timeline_duration(CxxRetainer* self, CxxErrorStruct* cxxErr) {