From 5cc4c1e21f8a1fa793576e97a2c4a1673b032ea3 Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Thu, 4 Apr 2024 12:04:35 -0700 Subject: [PATCH] Fix C++ examples for C++ 17 Signed-off-by: Darby Johnston --- examples/conform.cpp | 2 +- examples/io_perf_test.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/conform.cpp b/examples/conform.cpp index 842f5f3bb3..b0b934797a 100644 --- a/examples/conform.cpp +++ b/examples/conform.cpp @@ -96,7 +96,7 @@ int conform_timeline( // relink to the found path clip->set_media_reference(new otio::ExternalReference( "file://" + new_path, - otio::nullopt // the available range is unknown without opening the file + std::nullopt // the available range is unknown without opening the file )); count += 1; } diff --git a/examples/io_perf_test.cpp b/examples/io_perf_test.cpp index 920adfbeb0..067d063e3a 100644 --- a/examples/io_perf_test.cpp +++ b/examples/io_perf_test.cpp @@ -5,7 +5,6 @@ #include "opentimelineio/clip.h" #include "opentimelineio/typeRegistry.h" -#include "opentimelineio/any.h" #include "opentimelineio/serialization.h" #include "opentimelineio/deserialization.h" #include "opentimelineio/timeline.h" @@ -133,7 +132,7 @@ main( print_elapsed_time("downgrade clip", begin, end); } - otio::any tl; + std::any tl; std::string fname = std::string(argv[1]); // read file