Use https://github.com/martinmoene/optional-lite instead of std::optional

Since the only reason we used C++17 was to get std::optional, we downgrade
to C++11 in CMakeLists.

This commit imports version 3.5.0 of optional-lite.

Author: svedi

CMakeLists.txt

@@ -46,7 +46,7 @@ add_library (cryptolens ${CRYPTOLENS_LIBRARY_TYPE} ${SRC})
 target_link_libraries (cryptolens ${LIBS})
 target_include_directories (cryptolens PRIVATE "${cryptolens_SOURCE_DIR}/include/cryptolens")
 target_include_directories (cryptolens PUBLIC "${cryptolens_SOURCE_DIR}/include")
-set_property (TARGET cryptolens PROPERTY CXX_STANDARD 17)
+set_property (TARGET cryptolens PROPERTY CXX_STANDARD 11)
 set_property (TARGET cryptolens PROPERTY CXX_STANDARD_REQUIRED ON)
 
 if (${CRYPTOLENS_BUILD_TESTS})

examples/unix/cmake/CMakeLists.txt

@@ -39,30 +39,30 @@ add_subdirectory ("../../.." "cryptolens-cpp")
 
 add_executable(example_activate ../example_activate.cpp)
 target_link_libraries(example_activate cryptolens)
-set_property(TARGET example_activate PROPERTY CXX_STANDARD 17)
+set_property(TARGET example_activate PROPERTY CXX_STANDARD 11)
 set_property(TARGET example_activate PROPERTY CXX_STANDARD_REQUIRED ON)
 install(TARGETS example_activate DESTINATION bin)
 
 add_executable(example_create_trial_key ../example_create_trial_key.cpp)
 target_link_libraries(example_create_trial_key cryptolens)
-set_property(TARGET example_create_trial_key PROPERTY CXX_STANDARD 17)
+set_property(TARGET example_create_trial_key PROPERTY CXX_STANDARD 11)
 set_property(TARGET example_create_trial_key PROPERTY CXX_STANDARD_REQUIRED ON)
 install(TARGETS example_create_trial_key DESTINATION bin)
 
 add_executable(example_external ../example_external.cpp)
 target_link_libraries(example_external cryptolens)
-set_property(TARGET example_external PROPERTY CXX_STANDARD 17)
+set_property(TARGET example_external PROPERTY CXX_STANDARD 11)
 set_property(TARGET example_external PROPERTY CXX_STANDARD_REQUIRED ON)
 install(TARGETS example_external DESTINATION bin)
 
 add_executable(example_floating ../example_floating.cpp)
 target_link_libraries(example_floating cryptolens)
-set_property(TARGET example_floating PROPERTY CXX_STANDARD 17)
+set_property(TARGET example_floating PROPERTY CXX_STANDARD 11)
 set_property(TARGET example_floating PROPERTY CXX_STANDARD_REQUIRED ON)
 install(TARGETS example_floating DESTINATION bin)
 
 add_executable(example_offline ../example_offline.cpp)
 target_link_libraries(example_offline cryptolens)
-set_property(TARGET example_offline PROPERTY CXX_STANDARD 17)
+set_property(TARGET example_offline PROPERTY CXX_STANDARD 11)
 set_property(TARGET example_offline PROPERTY CXX_STANDARD_REQUIRED ON)
 install(TARGETS example_offline DESTINATION bin)

include/cryptolens/imports/std/optional

@@ -2,11 +2,11 @@
 
 #ifdef CRYPTOLENS_SHORT_INCLUDE_PATHS
 
-#include <optional>
+#include <optional.hpp>
 
 #else
 
-#include <optional>
+#include "../../../../third_party/optional-lite/optional.hpp"
 
 #endif
 
@@ -15,10 +15,10 @@ namespace cryptolens_io {
 namespace v20190401 {
 
 template<typename T>
-using optional = std::optional<T>;
+using optional = ::nonstd::optional<T>;
 
-using std::make_optional;
-using std::nullopt;
+using ::nonstd::make_optional;
+using ::nonstd::nullopt;
 
 } // namespace v20190401