coffee/ChaiScript
1
0
Fork 0
mirror of https://github.com/ChaiScript/ChaiScript.git synced 2026-02-07 10:19:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

experimental/variant for Apple compilers.

Browse Source
This commit is contained in:
Alek Mosingiewicz 2018-08-21 16:45:27 +02:00
parent 96142889e0
commit c1f36d44f2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -45,7 +45,7 @@ matrix:
env: CLANG_VER="5.0" env: CLANG_VER="5.0"
- os: osx - os: osx
compiler: clang compiler: clang
#sx_image: xcode10 osx_image: xcode10
env: CLANG_VER="5.0" CMAKE_OPTIONS="-D DYNLOAD_ENABLED:BOOL=FALSE -D MULTITHREAD_SUPPORT_ENABLED:BOOL=FALSE -D USE_STD_MAKE_SHARED:BOOL=TRUE" BUILD_ONLY=1 env: CLANG_VER="5.0" CMAKE_OPTIONS="-D DYNLOAD_ENABLED:BOOL=FALSE -D MULTITHREAD_SUPPORT_ENABLED:BOOL=FALSE -D USE_STD_MAKE_SHARED:BOOL=TRUE" BUILD_ONLY=1
env: env:

7
include/chaiscript/utility/json.hpp
View File

@ -18,7 +18,12 @@
#include <initializer_list> #include <initializer_list>
#include <ostream> #include <ostream>
#include <iostream> #include <iostream>
#include <variant> #ifdef __APPLE__
#include <experimental/variant>
#else
#include <variant>
#endif
#include "../chaiscript_defines.hpp" #include "../chaiscript_defines.hpp"
#include "quick_flat_map.hpp" #include "quick_flat_map.hpp"