Ditch the dependency on the optional submodule, nobody's ever gonna care about it...

This commit is contained in:
ThePhD 2016-11-01 05:31:59 -04:00
parent 8c8c7d1ee1
commit 1213c8959a
4 changed files with 1145 additions and 6 deletions

3
.gitmodules vendored
View File

@ -1,6 +1,3 @@
[submodule "Catch"] [submodule "Catch"]
path = Catch path = Catch
url = https://github.com/philsquared/Catch.git url = https://github.com/philsquared/Catch.git
[submodule "Optional"]
path = Optional
url = https://github.com/ThePhD/Optional.git

View File

@ -22,11 +22,11 @@
#ifndef SOL_OBJECT_HPP #ifndef SOL_OBJECT_HPP
#define SOL_OBJECT_HPP #define SOL_OBJECT_HPP
#include "optional.hpp"
#include "reference.hpp" #include "reference.hpp"
#include "stack.hpp" #include "stack.hpp"
#include "userdata.hpp" #include "userdata.hpp"
#include "variadic_args.hpp" #include "variadic_args.hpp"
#include "optional.hpp"
namespace sol { namespace sol {

View File

@ -22,11 +22,12 @@
#ifndef SOL_OPTIONAL_HPP #ifndef SOL_OPTIONAL_HPP
#define SOL_OPTIONAL_HPP #define SOL_OPTIONAL_HPP
#include "compatibility.hpp"
#include "in_place.hpp" #include "in_place.hpp"
#if defined(SOL_USE_BOOST) #if defined(SOL_USE_BOOST)
#include <boost/optional.hpp> #include <boost/optional.hpp>
#else #else
#include "../Optional/optional.hpp" #include "optional_implementation.hpp"
#endif // Boost vs. Better optional #endif // Boost vs. Better optional
namespace sol { namespace sol {

File diff suppressed because it is too large Load Diff