Skip to content

Commit 4ec9ef1

Browse files
Fix C++ examples for C++ 17 (#1723)
Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com>
1 parent b7cfbcf commit 4ec9ef1

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

examples/conform.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ int conform_timeline(
9696
// relink to the found path
9797
clip->set_media_reference(new otio::ExternalReference(
9898
"file://" + new_path,
99-
otio::nullopt // the available range is unknown without opening the file
99+
std::nullopt // the available range is unknown without opening the file
100100
));
101101
count += 1;
102102
}

examples/io_perf_test.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
#include "opentimelineio/clip.h"
77
#include "opentimelineio/typeRegistry.h"
8-
#include "opentimelineio/any.h"
98
#include "opentimelineio/serialization.h"
109
#include "opentimelineio/deserialization.h"
1110
#include "opentimelineio/timeline.h"
@@ -133,7 +132,7 @@ main(
133132
print_elapsed_time("downgrade clip", begin, end);
134133
}
135134

136-
otio::any tl;
135+
std::any tl;
137136
std::string fname = std::string(argv[1]);
138137

139138
// read file

0 commit comments

Comments
 (0)