Skip to content

Commit

Permalink
boost-lite is no more, it is now quickcpplib and lots of its internal…
Browse files Browse the repository at this point in the history
…s have changed. develop branch will be broken for some days until Outcome catches up.
  • Loading branch information
ned14 committed Jun 13, 2017
1 parent 127812a commit f3b54fa
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 16 deletions.
7 changes: 3 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
fetchRecurseSubmodules = true
ignore = none
# shallow = true ## master repo is always somewhat behind
[submodule "include/boost/outcome/boost-lite"]
path = include/boost/outcome/boost-lite
url = https://github.com/ned14/boost-lite.git
[submodule "include/boost/outcome/quickcpplib"]
path = include/boost/outcome/quickcpplib
url = https://github.com/ned14/quickcpplib
branch = master
fetchRecurseSubmodules = true
ignore = untracked
# shallow = true
1 change: 0 additions & 1 deletion include/boost/outcome/boost-lite
Submodule boost-lite deleted from 17d79a
14 changes: 6 additions & 8 deletions include/boost/outcome/outcome.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Deliberately without include guard to attempt to include differing versions
// Deliberately without include guard so attempt to include differing versions
// in same translation unit will produce compiler errors
#include "version.hpp"

Expand All @@ -7,19 +7,17 @@
#define BOOST_OUTCOME_HEADERS_PATH4(a) #a
#define BOOST_OUTCOME_HEADERS_PATH3(a) BOOST_OUTCOME_HEADERS_PATH4(a)

#if 0 // cmake's Makefiles and Ninja generators won't pick up dependent headers without this
#if 0 // cmake's Makefiles and Ninja generators won't pick up dependent headers without this
#include "v1.0/monad.hpp"
#endif

#if !defined(BOOST_OUTCOME_DISABLE_PREPROCESSED_INTERFACE_FILE) \
&& BOOST_OUTCOME_USE_BOOST_THREAD == 0 && BOOST_OUTCOME_USE_BOOST_ERROR_CODE == 0 \
&& !defined(BOOST_OUTCOME_ENABLE_ADVANCED) && !defined(__cpp_modules) && !defined(GENERATING_OUTCOME_MODULE_INTERFACE)
#if !defined(BOOST_OUTCOME_DISABLE_PREPROCESSED_INTERFACE_FILE) && BOOST_OUTCOME_USE_BOOST_THREAD == 0 && BOOST_OUTCOME_USE_BOOST_ERROR_CODE == 0 && !defined(BOOST_OUTCOME_ENABLE_ADVANCED) && !defined(__cpp_modules) && !defined(GENERATING_OUTCOME_MODULE_INTERFACE)

// Use the preprocessed edition
#if defined(_MSC_VER) && !defined(__clang__)
#define BOOST_OUTCOME_HEADERS_PATH2 BOOST_OUTCOME_VERSION_GLUE(outcome_v, BOOST_OUTCOME_HEADERS_VERSION, .hpp)
#elif !__PCPP_ALWAYS_FALSE__
#define BOOST_OUTCOME_HEADERS_PATH2 BOOST_OUTCOME_VERSION_GLUE(outcome_v, BOOST_OUTCOME_HEADERS_VERSION,).hpp
#define BOOST_OUTCOME_HEADERS_PATH2 BOOST_OUTCOME_VERSION_GLUE(outcome_v, BOOST_OUTCOME_HEADERS_VERSION, ).hpp
#endif

#define BOOST_OUTCOME_HEADERS_PATH BOOST_OUTCOME_HEADERS_PATH3(BOOST_OUTCOME_HEADERS_PATH2)
Expand All @@ -29,9 +27,9 @@

// Use the original sources
#if defined(_MSC_VER) && !defined(__clang__)
#define BOOST_OUTCOME_HEADERS_PATH2 BOOST_OUTCOME_VERSION_GLUE(v, BOOST_OUTCOME_HEADERS_VERSION, /monad.hpp)
#define BOOST_OUTCOME_HEADERS_PATH2 BOOST_OUTCOME_VERSION_GLUE(v, BOOST_OUTCOME_HEADERS_VERSION, / monad.hpp)
#elif !__PCPP_ALWAYS_FALSE__
#define BOOST_OUTCOME_HEADERS_PATH2 BOOST_OUTCOME_VERSION_GLUE(v, BOOST_OUTCOME_HEADERS_VERSION,)/monad.hpp
#define BOOST_OUTCOME_HEADERS_PATH2 BOOST_OUTCOME_VERSION_GLUE(v, BOOST_OUTCOME_HEADERS_VERSION, ) / monad.hpp
#endif

#define BOOST_OUTCOME_HEADERS_PATH4(a) #a
Expand Down
1 change: 1 addition & 0 deletions include/boost/outcome/quickcpplib
Submodule quickcpplib added at c4f202
6 changes: 3 additions & 3 deletions include/boost/outcome/revision.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time
#define BOOST_OUTCOME_PREVIOUS_COMMIT_REF e8c262fa470d0b0bd6f42806833f86051f3b322e
#define BOOST_OUTCOME_PREVIOUS_COMMIT_DATE "2017-05-20 10:34:14 +00:00"
#define BOOST_OUTCOME_PREVIOUS_COMMIT_UNIQUE e8c262fa
#define BOOST_OUTCOME_PREVIOUS_COMMIT_REF 127812aee9d6cdbb53a2f889ea58c89d4fc4b4e5
#define BOOST_OUTCOME_PREVIOUS_COMMIT_DATE "2017-05-27 14:24:26 +00:00"
#define BOOST_OUTCOME_PREVIOUS_COMMIT_UNIQUE 127812ae

0 comments on commit f3b54fa

Please sign in to comment.