mirror of
https://github.com/ThePhD/sol2.git
synced 2024-03-22 13:10:44 +08:00
Ditch the dependency on the optional submodule, nobody's ever gonna care about it...
This commit is contained in:
parent
8c8c7d1ee1
commit
1213c8959a
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -1,6 +1,3 @@
|
|||
[submodule "Catch"]
|
||||
path = Catch
|
||||
url = https://github.com/philsquared/Catch.git
|
||||
[submodule "Optional"]
|
||||
path = Optional
|
||||
url = https://github.com/ThePhD/Optional.git
|
||||
|
|
|
@ -22,11 +22,11 @@
|
|||
#ifndef SOL_OBJECT_HPP
|
||||
#define SOL_OBJECT_HPP
|
||||
|
||||
#include "optional.hpp"
|
||||
#include "reference.hpp"
|
||||
#include "stack.hpp"
|
||||
#include "userdata.hpp"
|
||||
#include "variadic_args.hpp"
|
||||
#include "optional.hpp"
|
||||
|
||||
namespace sol {
|
||||
|
||||
|
|
|
@ -22,11 +22,12 @@
|
|||
#ifndef SOL_OPTIONAL_HPP
|
||||
#define SOL_OPTIONAL_HPP
|
||||
|
||||
#include "compatibility.hpp"
|
||||
#include "in_place.hpp"
|
||||
#if defined(SOL_USE_BOOST)
|
||||
#include <boost/optional.hpp>
|
||||
#else
|
||||
#include "../Optional/optional.hpp"
|
||||
#include "optional_implementation.hpp"
|
||||
#endif // Boost vs. Better optional
|
||||
|
||||
namespace sol {
|
||||
|
|
1141
sol/optional_implementation.hpp
Normal file
1141
sol/optional_implementation.hpp
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user