Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-19 20:22:58 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2014-10-20 13:49:33 (GMT) |
| commit | 6b22dfcf59474dd016a0355a3102a1dd3692d92c (patch) | |
| tree | 2b1fd33be433a91e81fee84fdc2bf1b52575d934 /3rdParty/Expat | |
| parent | 38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff) | |
| download | swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.tar.bz2 | |
Update Boost in 3rdParty to version 1.56.0.
This updates Boost in our 3rdParty directory to version 1.56.0.
Updated our update.sh script to stop on error.
Changed error reporting in SwiftTools/CrashReporter.cpp to SWIFT_LOG due to
missing include of <iostream> with newer Boost.
Change-Id: I4b35c77de951333979a524097f35f5f83d325edc
Diffstat (limited to '3rdParty/Expat')
| -rw-r--r-- | 3rdParty/Expat/SConscript | 5 | ||||
| -rw-r--r-- | 3rdParty/Expat/expat_config.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/3rdParty/Expat/SConscript b/3rdParty/Expat/SConscript index d5724b4..e8c1e25 100644 --- a/3rdParty/Expat/SConscript +++ b/3rdParty/Expat/SConscript @@ -11,7 +11,10 @@ if env.get("EXPAT_BUNDLED", False) : if env["SCONS_STAGE"] == "build" : myenv = env.Clone() myenv.Append(CPPDEFINES = ["XML_STATIC", "HAVE_EXPAT_CONFIG_H"]) - myenv.Append(CPPPATH = [".", "src"]) + if env.get("BOOST_BUNDLED", False) : + myenv.Append(CPPPATH = [".", "src", "../Boost/src"]) + else : + myenv.Append(CPPPATH = [".", "src"]) conf = Configure(conf_env) if conf.CheckFunc('memmove') : diff --git a/3rdParty/Expat/expat_config.h b/3rdParty/Expat/expat_config.h index fb87f9a..f102a51 100644 --- a/3rdParty/Expat/expat_config.h +++ b/3rdParty/Expat/expat_config.h @@ -1,5 +1,5 @@ #define XML_CONTEXT_BYTES 1024 #define XML_NS 1 -#include "../Boost/src/boost/detail/endian.hpp" +#include <boost/detail/endian.hpp> #define BYTEORDER BOOST_BYTE_ORDER |