diff --git a/Builds/QtCreator/rippled.pro b/Builds/QtCreator/rippled.pro index 7e67307791..6d60cfb793 100644 --- a/Builds/QtCreator/rippled.pro +++ b/Builds/QtCreator/rippled.pro @@ -45,7 +45,6 @@ linux-g++:QMAKE_CXXFLAGS += \ -pthread INCLUDEPATH += \ - "../../src/BeastConfig/" \ "../../src/leveldb/" \ "../../src/leveldb/port" \ "../../src/leveldb/include" \ diff --git a/Builds/VisualStudio2013/RippleD.props b/Builds/VisualStudio2013/RippleD.props index 8263291148..71e2d474dc 100644 --- a/Builds/VisualStudio2013/RippleD.props +++ b/Builds/VisualStudio2013/RippleD.props @@ -14,7 +14,7 @@ _VARIADIC_MAX=10;_WIN32_WINNT=0x0600;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions) true Level3 - $(RepoDir)\src\BeastConfig;$(RepoDir)\src\protobuf\src;$(RepoDir)\src\protobuf\vsprojects;$(RepoDir)\src\leveldb;$(RepoDir)\src\leveldb\include;$(RepoDir)\build\proto;%(AdditionalIncludeDirectories) + $(RepoDir)\src\protobuf\src;$(RepoDir)\src\protobuf\vsprojects;$(RepoDir)\src\leveldb;$(RepoDir)\src\leveldb\include;$(RepoDir)\build\proto;%(AdditionalIncludeDirectories) /bigobj %(AdditionalOptions) Async 4018;4244 diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj index 14239607f8..5ed815b435 100644 --- a/Builds/VisualStudio2013/RippleD.vcxproj +++ b/Builds/VisualStudio2013/RippleD.vcxproj @@ -2234,7 +2234,7 @@ - + diff --git a/Builds/VisualStudio2013/RippleD.vcxproj.filters b/Builds/VisualStudio2013/RippleD.vcxproj.filters index 832e6db7c0..503928fdf6 100644 --- a/Builds/VisualStudio2013/RippleD.vcxproj.filters +++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters @@ -3041,7 +3041,6 @@ [2] Old Ripple\ripple_app\transactors - [1] Ripple\common\impl @@ -3054,6 +3053,7 @@ [1] Ripple\common + diff --git a/SConstruct b/SConstruct index ffdbb22e4f..24a91c5461 100644 --- a/SConstruct +++ b/SConstruct @@ -207,7 +207,6 @@ env['PRINT_CMD_LINE_FUNC'] = print_cmd_line # INCLUDE_PATHS = [ '.', - 'src/BeastConfig', 'src/leveldb', 'src/leveldb/port', 'src/leveldb/include', diff --git a/src/BeastConfig/BeastConfig.h b/src/BeastConfig.h similarity index 100% rename from src/BeastConfig/BeastConfig.h rename to src/BeastConfig.h diff --git a/src/beast/config/BeastConfig.h b/src/beast/BeastConfig.h similarity index 100% rename from src/beast/config/BeastConfig.h rename to src/beast/BeastConfig.h diff --git a/src/beast/Builds/VisualStudio2013/Beast.props b/src/beast/Builds/VisualStudio2013/Beast.props index 078aa95db6..95b35522ca 100644 --- a/src/beast/Builds/VisualStudio2013/Beast.props +++ b/src/beast/Builds/VisualStudio2013/Beast.props @@ -8,10 +8,10 @@ Level4 - BEAST_COMPILING_STATIC_LIBARARY=1;_CRTDBG_MAP_ALLOC;_WIN32_WINNT=0x0600;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + BEAST_INCLUDE_BEASTCONFIG=1;_CRTDBG_MAP_ALLOC;_WIN32_WINNT=0x0600;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true false - $(RepoDir)\config;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) diff --git a/src/beast/Builds/VisualStudio2013/beast.vcxproj b/src/beast/Builds/VisualStudio2013/beast.vcxproj index 27af4aa52d..dec4c069ca 100644 --- a/src/beast/Builds/VisualStudio2013/beast.vcxproj +++ b/src/beast/Builds/VisualStudio2013/beast.vcxproj @@ -82,6 +82,7 @@ + @@ -247,7 +248,6 @@ - diff --git a/src/beast/Builds/VisualStudio2013/beast.vcxproj.filters b/src/beast/Builds/VisualStudio2013/beast.vcxproj.filters index 5a20eee3ce..02791a4844 100644 --- a/src/beast/Builds/VisualStudio2013/beast.vcxproj.filters +++ b/src/beast/Builds/VisualStudio2013/beast.vcxproj.filters @@ -950,7 +950,6 @@ beast - beast\utility @@ -1323,6 +1322,7 @@ beast\http + diff --git a/src/beast/TODO.txt b/src/beast/TODO.txt index 169787991f..b58e7f661c 100644 --- a/src/beast/TODO.txt +++ b/src/beast/TODO.txt @@ -41,9 +41,6 @@ BEAST TODO - Think about doing away with BEAST_CALLTYPE and BEAST_API -- Decide if headers should just include BeastConfig.h instead of making the - host program do it. - - Rename malloc/calloc JUCE members that conflict with the debug CRT from MSVC - Reformat every Doxygen comment @@ -63,7 +60,7 @@ BEAST TODO - restructure the repo sources to look like this: /Source/beast/beast_core/beast_core.h etc... -- Put the BeastConfig.h at the root of the repo. + - Make sure the template BeastConfig.h is included in the Doxyfile - Implement robust key/value database with bulk write diff --git a/src/beast/beast/asio/Asio.cpp b/src/beast/beast/asio/Asio.cpp index a187814b82..fb60b4fd36 100644 --- a/src/beast/beast/asio/Asio.cpp +++ b/src/beast/beast/asio/Asio.cpp @@ -17,7 +17,9 @@ */ //============================================================================== -#include "BeastConfig.h" +#if BEAST_INCLUDE_BEASTCONFIG +#include "../../BeastConfig.h" +#endif #include "impl/IPAddressConversion.cpp" diff --git a/src/beast/beast/asio/tests/bind_handler_tests.cpp b/src/beast/beast/asio/tests/bind_handler_tests.cpp index e24ed35d1e..7992e1f106 100644 --- a/src/beast/beast/asio/tests/bind_handler_tests.cpp +++ b/src/beast/beast/asio/tests/bind_handler_tests.cpp @@ -17,7 +17,9 @@ */ //============================================================================== -#include "BeastConfig.h" +#if BEAST_INCLUDE_BEASTCONFIG +#include "../../../BeastConfig.h" +#endif #include "../../../modules/beast_core/beast_core.h" // for UnitTest diff --git a/src/beast/beast/asio/tests/enable_wait_for_async.test.cpp b/src/beast/beast/asio/tests/enable_wait_for_async.test.cpp index 1822e446d6..191cbb4b7d 100644 --- a/src/beast/beast/asio/tests/enable_wait_for_async.test.cpp +++ b/src/beast/beast/asio/tests/enable_wait_for_async.test.cpp @@ -17,7 +17,9 @@ */ //============================================================================== -#include "BeastConfig.h" +#if BEAST_INCLUDE_BEASTCONFIG +#include "../../../BeastConfig.h" +#endif #include "../../../modules/beast_core/beast_core.h" // for UnitTest diff --git a/src/beast/beast/asio/tests/shared_handler_tests.cpp b/src/beast/beast/asio/tests/shared_handler_tests.cpp index 18613847f7..358ff798bc 100644 --- a/src/beast/beast/asio/tests/shared_handler_tests.cpp +++ b/src/beast/beast/asio/tests/shared_handler_tests.cpp @@ -17,7 +17,9 @@ */ //============================================================================== -#include "BeastConfig.h" +#if BEAST_INCLUDE_BEASTCONFIG +#include "../../../BeastConfig.h" +#endif #include "../../../modules/beast_core/beast_core.h" // for UnitTest diff --git a/src/beast/beast/asio/tests/wrap_handler_tests.cpp b/src/beast/beast/asio/tests/wrap_handler_tests.cpp index 7ccc2b3984..de368f74f3 100644 --- a/src/beast/beast/asio/tests/wrap_handler_tests.cpp +++ b/src/beast/beast/asio/tests/wrap_handler_tests.cpp @@ -17,7 +17,9 @@ */ //============================================================================== -#include "BeastConfig.h" +#if BEAST_INCLUDE_BEASTCONFIG +#include "../../../BeastConfig.h" +#endif #include "../../../modules/beast_core/beast_core.h" // for UnitTest diff --git a/src/beast/beast/boost/Boost.cpp b/src/beast/beast/boost/Boost.cpp index 72ee96d0af..f692682bff 100644 --- a/src/beast/beast/boost/Boost.cpp +++ b/src/beast/beast/boost/Boost.cpp @@ -17,7 +17,9 @@ */ //============================================================================== -#include "BeastConfig.h" +#if BEAST_INCLUDE_BEASTCONFIG +#include "../../BeastConfig.h" +#endif #include "ErrorCode.h" diff --git a/src/beast/beast/chrono/Chrono.cpp b/src/beast/beast/chrono/Chrono.cpp index 28f92f8ccd..0540b946d3 100644 --- a/src/beast/beast/chrono/Chrono.cpp +++ b/src/beast/beast/chrono/Chrono.cpp @@ -17,7 +17,9 @@ */ //============================================================================== -#include "BeastConfig.h" +#if BEAST_INCLUDE_BEASTCONFIG +#include "../../BeastConfig.h" +#endif #include "../Config.h" #include "../../modules/beast_core/beast_core.h" // for UnitTest diff --git a/src/beast/beast/config/ConfigCheck.h b/src/beast/beast/config/ConfigCheck.h index d92eaff01d..8f666c3517 100644 --- a/src/beast/beast/config/ConfigCheck.h +++ b/src/beast/beast/config/ConfigCheck.h @@ -20,25 +20,6 @@ #ifndef BEAST_CONFIG_CONFIGCHECK_H_INCLUDED #define BEAST_CONFIG_CONFIGCHECK_H_INCLUDED -// This file makes sure that BeastConfig.h was included. -// It also sets defaults for all config options. - -/* If you fail to make sure that all your compile units are building Beast with - the same set of option flags, then there's a risk that different compile - units will treat the classes as having different memory layouts, leading to - very nasty memory corruption errors when they all get linked together. - That's why it's best to always include the BeastConfig.h file before any - beast headers. -*/ -#ifndef BEAST_BEASTCONFIG_H_INCLUDED -# ifdef _MSC_VER -# pragma message ("Have you included your BeastConfig.h file before including the Beast headers?") -# else -# warning "Have you included your BeastConfig.h file before including the Beast headers?" -# endif -# error "BeastConfig.h must be included before any Beast headers!" -#endif - // // Apply sensible defaults for the configuration settings // diff --git a/src/beast/beast/container/Container.cpp b/src/beast/beast/container/Container.cpp index 675854b171..1cf70c77f2 100644 --- a/src/beast/beast/container/Container.cpp +++ b/src/beast/beast/container/Container.cpp @@ -17,7 +17,9 @@ */ //============================================================================== -#include "BeastConfig.h" +#if BEAST_INCLUDE_BEASTCONFIG +#include "../../BeastConfig.h" +#endif #include "impl/aged_associative_container.cpp" diff --git a/src/beast/beast/crypto/Crypto.cpp b/src/beast/beast/crypto/Crypto.cpp index 5fa107022a..f4c1eb1cbb 100644 --- a/src/beast/beast/crypto/Crypto.cpp +++ b/src/beast/beast/crypto/Crypto.cpp @@ -17,7 +17,9 @@ */ //============================================================================== -#include "BeastConfig.h" +#if BEAST_INCLUDE_BEASTCONFIG +#include "../../BeastConfig.h" +#endif #include "../../modules/beast_core/beast_core.h" // for UnitTest diff --git a/src/beast/beast/cxx14/tests/integer_sequence.test.cpp b/src/beast/beast/cxx14/tests/integer_sequence.test.cpp index 2f1b0baab4..5846cfe6a7 100644 --- a/src/beast/beast/cxx14/tests/integer_sequence.test.cpp +++ b/src/beast/beast/cxx14/tests/integer_sequence.test.cpp @@ -17,7 +17,9 @@ */ //============================================================================== -#include "BeastConfig.h" +#if BEAST_INCLUDE_BEASTCONFIG +#include "../../../BeastConfig.h" +#endif #include "../utility.h" diff --git a/src/beast/beast/http/HTTP.cpp b/src/beast/beast/http/HTTP.cpp index 7d99836cf0..25a2286475 100644 --- a/src/beast/beast/http/HTTP.cpp +++ b/src/beast/beast/http/HTTP.cpp @@ -17,7 +17,9 @@ */ //============================================================================== -#include "BeastConfig.h" +#if BEAST_INCLUDE_BEASTCONFIG +#include "../../BeastConfig.h" +#endif #include "impl/URL.cpp" #include "impl/ParsedURL.cpp" diff --git a/src/beast/beast/http/impl/joyent_parser.cpp b/src/beast/beast/http/impl/joyent_parser.cpp index 490c19f9d7..edd2973290 100644 --- a/src/beast/beast/http/impl/joyent_parser.cpp +++ b/src/beast/beast/http/impl/joyent_parser.cpp @@ -17,10 +17,6 @@ */ //============================================================================== -#include "BeastConfig.h" - -#include "../../Config.h" - namespace beast { namespace joyent { diff --git a/src/beast/beast/http/impl/joyent_parser.h b/src/beast/beast/http/impl/joyent_parser.h index 01b307e29b..e65baeb848 100644 --- a/src/beast/beast/http/impl/joyent_parser.h +++ b/src/beast/beast/http/impl/joyent_parser.h @@ -20,8 +20,6 @@ #ifndef BEAST_HTTP_JOYENT_PARSER_H_INCLUDED #define BEAST_HTTP_JOYENT_PARSER_H_INCLUDED -#include "BeastConfig.h" - #include "../basic_message.h" // TODO Use diff --git a/src/beast/beast/insight/Insight.cpp b/src/beast/beast/insight/Insight.cpp index eaf1faaea6..209364788a 100644 --- a/src/beast/beast/insight/Insight.cpp +++ b/src/beast/beast/insight/Insight.cpp @@ -17,7 +17,9 @@ */ //============================================================================== -#include "BeastConfig.h" +#if BEAST_INCLUDE_BEASTCONFIG +#include "../../BeastConfig.h" +#endif #include "../Config.h" diff --git a/src/beast/beast/net/Net.cpp b/src/beast/beast/net/Net.cpp index afac1339de..6180dfa1ab 100644 --- a/src/beast/beast/net/Net.cpp +++ b/src/beast/beast/net/Net.cpp @@ -17,7 +17,9 @@ */ //============================================================================== -#include "BeastConfig.h" +#if BEAST_INCLUDE_BEASTCONFIG +#include "../../BeastConfig.h" +#endif #include "../Config.h" diff --git a/src/beast/beast/smart_ptr/SmartPtr.cpp b/src/beast/beast/smart_ptr/SmartPtr.cpp index 59a677e492..0216422ecd 100644 --- a/src/beast/beast/smart_ptr/SmartPtr.cpp +++ b/src/beast/beast/smart_ptr/SmartPtr.cpp @@ -17,7 +17,9 @@ */ //============================================================================== -#include "BeastConfig.h" +#if BEAST_INCLUDE_BEASTCONFIG +#include "../../BeastConfig.h" +#endif #include "../Config.h" diff --git a/src/beast/beast/strings/Strings.cpp b/src/beast/beast/strings/Strings.cpp index d76435f800..09b32a3470 100644 --- a/src/beast/beast/strings/Strings.cpp +++ b/src/beast/beast/strings/Strings.cpp @@ -17,7 +17,9 @@ */ //============================================================================== -#include "BeastConfig.h" +#if BEAST_INCLUDE_BEASTCONFIG +#include "../../BeastConfig.h" +#endif #include "impl/CharacterFunctions.cpp" #include "impl/String.cpp" diff --git a/src/beast/beast/threads/Threads.cpp b/src/beast/beast/threads/Threads.cpp index a941c1e848..a2e9491651 100644 --- a/src/beast/beast/threads/Threads.cpp +++ b/src/beast/beast/threads/Threads.cpp @@ -17,7 +17,9 @@ */ //============================================================================== -#include "BeastConfig.h" +#if BEAST_INCLUDE_BEASTCONFIG +#include "../../BeastConfig.h" +#endif #include "impl/Atomic.cpp" #include "impl/RecursiveMutex.cpp" diff --git a/src/beast/beast/utility/Utility.cpp b/src/beast/beast/utility/Utility.cpp index baeef86815..eb5d53d3f8 100644 --- a/src/beast/beast/utility/Utility.cpp +++ b/src/beast/beast/utility/Utility.cpp @@ -17,7 +17,9 @@ */ //============================================================================== -#include "BeastConfig.h" +#if BEAST_INCLUDE_BEASTCONFIG +#include "../../BeastConfig.h" +#endif #include "impl/Error.cpp" diff --git a/src/beast/demos/unittests/.gitignore b/src/beast/demos/unittests/.gitignore deleted file mode 100644 index cf321b73d0..0000000000 --- a/src/beast/demos/unittests/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -builds/vs2012/Debug -builds/vs2012/Release diff --git a/src/beast/demos/unittests/builds/vs2012/unittests.filters b/src/beast/demos/unittests/builds/vs2012/unittests.filters deleted file mode 100644 index 6ff4acf0ba..0000000000 --- a/src/beast/demos/unittests/builds/vs2012/unittests.filters +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - shared - - - - - {986861c7-f1e7-4a41-bea0-eede68819634} - - - - - shared - - - \ No newline at end of file diff --git a/src/beast/demos/unittests/builds/vs2012/unittests.vcxproj b/src/beast/demos/unittests/builds/vs2012/unittests.vcxproj deleted file mode 100644 index 2164c4aac7..0000000000 --- a/src/beast/demos/unittests/builds/vs2012/unittests.vcxproj +++ /dev/null @@ -1,93 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {36E40B92-F578-4599-9909-70952176D18A} - Win32Proj - - - - - - Application - true - v110 - Unicode - - - Application - false - v110 - true - Unicode - - - - - - - - - - - - - true - - - false - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(ProjectDir)..\..\..\..\config;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\beast;%(AdditionalIncludeDirectories) - - - Console - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(ProjectDir)..\..\..\..\config;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\beast - - - Console - true - true - true - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/beast/demos/unittests/builds/xcode/unittests.xcodeproj/project.pbxproj b/src/beast/demos/unittests/builds/xcode/unittests.xcodeproj/project.pbxproj deleted file mode 100644 index 5aa5935ece..0000000000 --- a/src/beast/demos/unittests/builds/xcode/unittests.xcodeproj/project.pbxproj +++ /dev/null @@ -1,279 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - CD0A5B3F181707F700DA0342 /* mac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD0A5B3E181707F700DA0342 /* mac.cpp */; }; - CD0A5B421817097800DA0342 /* BeastUnitTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD0A5B401817097800DA0342 /* BeastUnitTests.cpp */; }; - CD0A5B4918170DC300DA0342 /* beast_modules.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD0A5B4818170DC300DA0342 /* beast_modules.mm */; }; - CD0A5B4B18170EBC00DA0342 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD0A5B4A18170EBC00DA0342 /* CoreServices.framework */; }; - CD0A5B4E18170F0D00DA0342 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD0A5B4D18170F0D00DA0342 /* AppKit.framework */; }; - CD1CBE68181B2D99002CCC0C /* juce_modules.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD1CBE64181B2689002CCC0C /* juce_modules.mm */; }; -/* End PBXBuildFile section */ - -/* Begin PBXCopyFilesBuildPhase section */ - CD0A5B301817074500DA0342 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = /usr/share/man/man1/; - dstSubfolderSpec = 0; - files = ( - ); - runOnlyForDeploymentPostprocessing = 1; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - CD0A5B321817074500DA0342 /* unittests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = unittests; sourceTree = BUILT_PRODUCTS_DIR; }; - CD0A5B3E181707F700DA0342 /* mac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mac.cpp; path = ../../src/mac.cpp; sourceTree = ""; }; - CD0A5B401817097800DA0342 /* BeastUnitTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BeastUnitTests.cpp; path = ../../src/BeastUnitTests.cpp; sourceTree = ""; }; - CD0A5B411817097800DA0342 /* BeastUnitTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BeastUnitTests.h; path = ../../src/BeastUnitTests.h; sourceTree = ""; }; - CD0A5B4318170A5100DA0342 /* beast_modules.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = beast_modules.cpp; path = ../../src/beast_modules.cpp; sourceTree = ""; }; - CD0A5B4418170A5100DA0342 /* beast_modules.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = beast_modules.h; path = ../../src/beast_modules.h; sourceTree = ""; }; - CD0A5B4818170DC300DA0342 /* beast_modules.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = beast_modules.mm; path = ../../src/beast_modules.mm; sourceTree = ""; }; - CD0A5B4A18170EBC00DA0342 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; }; - CD0A5B4D18170F0D00DA0342 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; - CD0A5B4F181714A000DA0342 /* beast */ = {isa = PBXFileReference; lastKnownFileType = folder; name = beast; path = ../../../../beast; sourceTree = ""; }; - CD0A5B50181714B800DA0342 /* modules */ = {isa = PBXFileReference; lastKnownFileType = folder; name = modules; path = ../../../../modules; sourceTree = ""; }; - CD1CBE62181B2689002CCC0C /* juce_modules.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = juce_modules.cpp; path = ../../src/juce_modules.cpp; sourceTree = ""; }; - CD1CBE63181B2689002CCC0C /* juce_modules.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = juce_modules.h; path = ../../src/juce_modules.h; sourceTree = ""; }; - CD1CBE64181B2689002CCC0C /* juce_modules.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_modules.mm; path = ../../src/juce_modules.mm; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - CD0A5B2F1817074500DA0342 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - CD0A5B4E18170F0D00DA0342 /* AppKit.framework in Frameworks */, - CD0A5B4B18170EBC00DA0342 /* CoreServices.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - CD0A5B291817074500DA0342 = { - isa = PBXGroup; - children = ( - CD0A5B50181714B800DA0342 /* modules */, - CD0A5B4F181714A000DA0342 /* beast */, - CD0A5B4318170A5100DA0342 /* beast_modules.cpp */, - CD0A5B4418170A5100DA0342 /* beast_modules.h */, - CD0A5B4818170DC300DA0342 /* beast_modules.mm */, - CD0A5B401817097800DA0342 /* BeastUnitTests.cpp */, - CD0A5B411817097800DA0342 /* BeastUnitTests.h */, - CD1CBE62181B2689002CCC0C /* juce_modules.cpp */, - CD1CBE63181B2689002CCC0C /* juce_modules.h */, - CD1CBE64181B2689002CCC0C /* juce_modules.mm */, - CD0A5B3E181707F700DA0342 /* mac.cpp */, - CD0A5B4C18170EC600DA0342 /* Frameworks */, - CD0A5B331817074500DA0342 /* Products */, - ); - sourceTree = ""; - }; - CD0A5B331817074500DA0342 /* Products */ = { - isa = PBXGroup; - children = ( - CD0A5B321817074500DA0342 /* unittests */, - ); - name = Products; - sourceTree = ""; - }; - CD0A5B4C18170EC600DA0342 /* Frameworks */ = { - isa = PBXGroup; - children = ( - CD0A5B4D18170F0D00DA0342 /* AppKit.framework */, - CD0A5B4A18170EBC00DA0342 /* CoreServices.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - CD0A5B311817074500DA0342 /* unittests */ = { - isa = PBXNativeTarget; - buildConfigurationList = CD0A5B3B1817074500DA0342 /* Build configuration list for PBXNativeTarget "unittests" */; - buildPhases = ( - CD0A5B2E1817074500DA0342 /* Sources */, - CD0A5B2F1817074500DA0342 /* Frameworks */, - CD0A5B301817074500DA0342 /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = unittests; - productName = unittests; - productReference = CD0A5B321817074500DA0342 /* unittests */; - productType = "com.apple.product-type.tool"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - CD0A5B2A1817074500DA0342 /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0500; - ORGANIZATIONNAME = "Patrick Dehne"; - }; - buildConfigurationList = CD0A5B2D1817074500DA0342 /* Build configuration list for PBXProject "unittests" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - en, - ); - mainGroup = CD0A5B291817074500DA0342; - productRefGroup = CD0A5B331817074500DA0342 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - CD0A5B311817074500DA0342 /* unittests */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXSourcesBuildPhase section */ - CD0A5B2E1817074500DA0342 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - CD0A5B3F181707F700DA0342 /* mac.cpp in Sources */, - CD0A5B421817097800DA0342 /* BeastUnitTests.cpp in Sources */, - CD1CBE68181B2D99002CCC0C /* juce_modules.mm in Sources */, - CD0A5B4918170DC300DA0342 /* beast_modules.mm in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - CD0A5B391817074500DA0342 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_OBJC_ARC = NO; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../src", - "$(SRCROOT)/../../../../../../../JUCE", - "$(SRCROOT)/../../../../config", - "$(SRCROOT)/../../../..", - ); - MACOSX_DEPLOYMENT_TARGET = 10.8; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - }; - name = Debug; - }; - CD0A5B3A1817074500DA0342 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_OBJC_ARC = NO; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../src", - "$(SRCROOT)/../../../../../../../JUCE", - "$(SRCROOT)/../../../../config", - "$(SRCROOT)/../../../..", - ); - MACOSX_DEPLOYMENT_TARGET = 10.8; - SDKROOT = macosx; - }; - name = Release; - }; - CD0A5B3C1817074500DA0342 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - CD0A5B3D1817074500DA0342 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - CD0A5B2D1817074500DA0342 /* Build configuration list for PBXProject "unittests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - CD0A5B391817074500DA0342 /* Debug */, - CD0A5B3A1817074500DA0342 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - CD0A5B3B1817074500DA0342 /* Build configuration list for PBXNativeTarget "unittests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - CD0A5B3C1817074500DA0342 /* Debug */, - CD0A5B3D1817074500DA0342 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = CD0A5B2A1817074500DA0342 /* Project object */; -} diff --git a/src/beast/demos/unittests/src/AppConfig.h b/src/beast/demos/unittests/src/AppConfig.h deleted file mode 100644 index df92349a63..0000000000 --- a/src/beast/demos/unittests/src/AppConfig.h +++ /dev/null @@ -1,94 +0,0 @@ -/* - - IMPORTANT! This file is auto-generated each time you save your - project - if you alter its contents, your changes may be overwritten! - - There's a section below where you can add your own custom code safely, and the - Introjucer will preserve the contents of that block, but the best way to change - any of these definitions is by using the Introjucer's project settings. - - Any commented-out settings will assume their default values. - -*/ - -#ifndef __JUCE_APPCONFIG_M70QFTRRK__ -#define __JUCE_APPCONFIG_M70QFTRRK__ - -//============================================================================== -// [BEGIN_USER_CODE_SECTION] - -// (You can add your own code in this section, and the Introjucer will not overwrite it) - -// [END_USER_CODE_SECTION] - -//============================================================================== -#define JUCE_MODULE_AVAILABLE_juce_core 1 -//#define JUCE_MODULE_AVAILABLE_juce_cryptography 1 -//#define JUCE_MODULE_AVAILABLE_juce_data_structures 1 -#define JUCE_MODULE_AVAILABLE_juce_events 1 -//#define JUCE_MODULE_AVAILABLE_juce_graphics 1 -//#define JUCE_MODULE_AVAILABLE_juce_gui_basics 1 -//#define JUCE_MODULE_AVAILABLE_juce_gui_extra 1 - -//============================================================================== -// juce_core flags: - -#ifndef JUCE_FORCE_DEBUG - //#define JUCE_FORCE_DEBUG -#endif - -#ifndef JUCE_LOG_ASSERTIONS - #define JUCE_LOG_ASSERTIONS 1 -#endif - -#ifndef JUCE_CHECK_MEMORY_LEAKS - //#define JUCE_CHECK_MEMORY_LEAKS -#endif - -#ifndef JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES - //#define JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES -#endif - -#ifndef JUCE_INCLUDE_ZLIB_CODE - //#define JUCE_INCLUDE_ZLIB_CODE -#endif - -//============================================================================== -// juce_graphics flags: - -#ifndef JUCE_USE_COREIMAGE_LOADER - #define JUCE_USE_COREIMAGE_LOADER 0 -#endif - -#ifndef JUCE_USE_DIRECTWRITE - //#define JUCE_USE_DIRECTWRITE -#endif - -//============================================================================== -// juce_gui_basics flags: - -#ifndef JUCE_ENABLE_REPAINT_DEBUGGING - //#define JUCE_ENABLE_REPAINT_DEBUGGING -#endif - -#ifndef JUCE_USE_XSHM - //#define JUCE_USE_XSHM -#endif - -#ifndef JUCE_USE_XRENDER - //#define JUCE_USE_XRENDER -#endif - -#ifndef JUCE_USE_XCURSOR - //#define JUCE_USE_XCURSOR -#endif - -//============================================================================== -// juce_gui_extra flags: - -#ifndef JUCE_WEB_BROWSER - //#define JUCE_WEB_BROWSER -#endif - - -#endif // __JUCE_APPCONFIG_M70QFTRRK__ diff --git a/src/beast/demos/unittests/src/BeastUnitTests.cpp b/src/beast/demos/unittests/src/BeastUnitTests.cpp deleted file mode 100644 index 25c90f975e..0000000000 --- a/src/beast/demos/unittests/src/BeastUnitTests.cpp +++ /dev/null @@ -1,79 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of Beast: https://github.com/vinniefalco/Beast - Copyright 2013, Vinnie Falco - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ -//============================================================================== - -#include "BeastUnitTests.h" - -class BeastUnitTests : public beast::UnitTests -{ -public: - explicit BeastUnitTests (bool shouldLog) - : m_shouldLog (shouldLog) - { - } - - void logMessage (beast::String const& message) - { - if (m_shouldLog) - std::cout << message.toStdString () << std::endl; - } - -private: - bool const m_shouldLog; -}; - -int runUnitTests (beast::String const& match, beast::String const& format) -{ - bool const shouldLog = format != "junit"; - - if (format != "junit" && format != "text" && format != "") - { - beast::String s; - s << "Warning, unknown unittest-format='" << format << "'"; - // Log::out () << s.toStdString (); - } - - BeastUnitTests tr (shouldLog); - - tr.runSelectedTests (match); - - if (format == "junit") - { - beast::UnitTestUtilities::JUnitXMLFormatter f (tr); - - beast::String const s = f.createDocumentString (); - - std::cout << s.toStdString (); - } - else - { - beast::UnitTests::Results const& r (tr.getResults ()); - - beast::String s; - - s << "Summary: " << - beast::String (r.suites.size ()) << " suites, " << - beast::String (r.cases) << " cases, " << - beast::String (r.tests) << " tests, " << - beast::String (r.failures) << " failure" << ((r.failures != 1) ? "s" : "") << "."; - - tr.logMessage (s); - } - - return tr.anyTestsFailed () ? EXIT_FAILURE : EXIT_SUCCESS; -} diff --git a/src/beast/demos/unittests/src/BeastUnitTests.h b/src/beast/demos/unittests/src/BeastUnitTests.h deleted file mode 100644 index f26246eef4..0000000000 --- a/src/beast/demos/unittests/src/BeastUnitTests.h +++ /dev/null @@ -1,27 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of Beast: https://github.com/vinniefalco/Beast - Copyright 2013, Vinnie Falco - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -//============================================================================== - -#ifndef UNITTESTS_BEASTUNITTESTS_H_INCLUDED -#define UNITTESTS_BEASTUNITTESTS_H_INCLUDED - -#include "beast_modules.h" - -int runUnitTests (beast::String const& match, beast::String const& format); - -#endif diff --git a/src/beast/demos/unittests/src/beast_modules.cpp b/src/beast/demos/unittests/src/beast_modules.cpp deleted file mode 100644 index 8d05fc23ba..0000000000 --- a/src/beast/demos/unittests/src/beast_modules.cpp +++ /dev/null @@ -1,31 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of Beast: https://github.com/vinniefalco/Beast - Copyright 2013, Vinnie Falco - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ -//============================================================================== - -#include "beast_modules.h" - -#include "modules/beast_core/beast_core.cpp" -#include "modules/beast_vflib/beast_vflib.cpp" - -#include "beast/chrono/Chrono.cpp" -#include "beast/crypto/Crypto.cpp" -#include "beast/strings/Strings.cpp" -#include "beast/threads/Threads.cpp" -//#include "beast/http/HTTP.cpp" -#include "beast/net/Net.cpp" -#include "beast/utility/Utility.cpp" diff --git a/src/beast/demos/unittests/src/beast_modules.h b/src/beast/demos/unittests/src/beast_modules.h deleted file mode 100644 index 955aeb456a..0000000000 --- a/src/beast/demos/unittests/src/beast_modules.h +++ /dev/null @@ -1,33 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of Beast: https://github.com/vinniefalco/Beast - Copyright 2013, Vinnie Falco - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ -//============================================================================== - -#ifndef UNITTESTS_BEASTMODULES_H_INCLUDED -#define UNITTESTS_BEASTMODULES_H_INCLUDED - -#include "BeastConfig.h" - -#include "modules/beast_core/beast_core.h" -#include "modules/beast_vflib/beast_vflib.h" - -#include "beast/Strings.h" -#include "beast/Threads.h" -#include "beast/SmartPtr.h" -#include "beast/Chrono.h" - -#endif diff --git a/src/beast/demos/unittests/src/beast_modules.mm b/src/beast/demos/unittests/src/beast_modules.mm deleted file mode 100644 index 4eebeb14d5..0000000000 --- a/src/beast/demos/unittests/src/beast_modules.mm +++ /dev/null @@ -1,20 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of Beast: https://github.com/vinniefalco/Beast - Copyright 2013, Vinnie Falco - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ -//============================================================================== - -#include "beast_modules.cpp" diff --git a/src/beast/demos/unittests/src/juce_modules.cpp b/src/beast/demos/unittests/src/juce_modules.cpp deleted file mode 100644 index 8fc5db542b..0000000000 --- a/src/beast/demos/unittests/src/juce_modules.cpp +++ /dev/null @@ -1,21 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of Beast: https://github.com/vinniefalco/Beast - Copyright 2013, Vinnie Falco - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ -//============================================================================== - -#include "modules/juce_core/juce_core.cpp" -#include "modules/juce_events/juce_events.cpp" diff --git a/src/beast/demos/unittests/src/juce_modules.h b/src/beast/demos/unittests/src/juce_modules.h deleted file mode 100644 index e1af1b0f44..0000000000 --- a/src/beast/demos/unittests/src/juce_modules.h +++ /dev/null @@ -1,28 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of Beast: https://github.com/vinniefalco/Beast - Copyright 2013, Vinnie Falco - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ -//============================================================================== - -#ifndef UNITTESTS_JUCEMODULES_H_INCLUDED -#define UNITTESTS_JUCEMODULES_H_INCLUDED - -#include "AppConfig.h" - -#include "modules/juce_core/juce_core.h" -#include "modules/juce_events/juce_events.h" - -#endif diff --git a/src/beast/demos/unittests/src/juce_modules.mm b/src/beast/demos/unittests/src/juce_modules.mm deleted file mode 100644 index 58e56bc68b..0000000000 --- a/src/beast/demos/unittests/src/juce_modules.mm +++ /dev/null @@ -1,20 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of Beast: https://github.com/vinniefalco/Beast - Copyright 2013, Vinnie Falco - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ -//============================================================================== - -#include "juce_modules.cpp" diff --git a/src/beast/demos/unittests/src/mac.cpp b/src/beast/demos/unittests/src/mac.cpp deleted file mode 100644 index 1d6868f239..0000000000 --- a/src/beast/demos/unittests/src/mac.cpp +++ /dev/null @@ -1,29 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of Beast: https://github.com/vinniefalco/Beast - Copyright 2013, Vinnie Falco - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ -//============================================================================== - -#include "juce_modules.h" -#include "beast_modules.h" - -#include "BeastUnitTests.h" - -int main(int argc, const char * argv[]) -{ - juce::ScopedJuceInitialiser_GUI juce; - return runUnitTests("", "text"); -} diff --git a/src/beast/demos/unittests/src/win32.cpp b/src/beast/demos/unittests/src/win32.cpp deleted file mode 100644 index 35b8f2c4ba..0000000000 --- a/src/beast/demos/unittests/src/win32.cpp +++ /dev/null @@ -1,30 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of Beast: https://github.com/vinniefalco/Beast - Copyright Patrick Dehne (www.sonicweb-radio.de) - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -//============================================================================== - -#include -#include - -#include "BeastUnitTests.h" - -int _tmain(int argc, _TCHAR* argv[]) -{ - runUnitTests("", "text"); - - return 0; -} diff --git a/src/beast/modules/beast_asio/beast_asio.cpp b/src/beast/modules/beast_asio/beast_asio.cpp index f47f90c304..7e21a743aa 100644 --- a/src/beast/modules/beast_asio/beast_asio.cpp +++ b/src/beast/modules/beast_asio/beast_asio.cpp @@ -17,7 +17,9 @@ */ //============================================================================== -#include "BeastConfig.h" +#if BEAST_INCLUDE_BEASTCONFIG +#include "../../BeastConfig.h" +#endif #include "system/OpenSSLIncludes.h" diff --git a/src/beast/modules/beast_asio/beast_asio.h b/src/beast/modules/beast_asio/beast_asio.h index 865c7ba7fd..9557ebfaf1 100644 --- a/src/beast/modules/beast_asio/beast_asio.h +++ b/src/beast/modules/beast_asio/beast_asio.h @@ -20,23 +20,6 @@ #ifndef BEAST_ASIO_MODULE_H_INCLUDED #define BEAST_ASIO_MODULE_H_INCLUDED -//------------------------------------------------------------------------------ - -/* If you fail to make sure that all your compile units are building Beast with - the same set of option flags, then there's a risk that different compile - units will treat the classes as having different memory layouts, leading to - very nasty memory corruption errors when they all get linked together. - That's why it's best to always include the BeastConfig.h file before any - beast headers. -*/ -#ifndef BEAST_BEASTCONFIG_H_INCLUDED -# ifdef _MSC_VER -# pragma message ("Have you included your BeastConfig.h file before including the Beast headers?") -# else -# warning "Have you included your BeastConfig.h file before including the Beast headers?" -# endif -#endif - // Must come before boost includes to fix the bost placeholders. #include "../beast_core/beast_core.h" diff --git a/src/beast/modules/beast_core/beast_core.cpp b/src/beast/modules/beast_core/beast_core.cpp index d250fbd476..13acd24dde 100644 --- a/src/beast/modules/beast_core/beast_core.cpp +++ b/src/beast/modules/beast_core/beast_core.cpp @@ -21,9 +21,9 @@ */ //============================================================================== -// Your project must contain a BeastConfig.h file with your project-specific settings in it, -// and your header search path must make it accessible to the module's files. -#include "BeastConfig.h" +#if BEAST_INCLUDE_BEASTCONFIG +#include "../../BeastConfig.h" +#endif //============================================================================== #include "native/BasicNativeHeaders.h" @@ -280,23 +280,5 @@ void beast_reportFatalError (char const* message, char const* fileName, int line #pragma pop_macro("_aligned_msize") #endif -//------------------------------------------------------------------------------ - -// When we compile the static library, which is really just for browsing the -// sources in the Visual Studio IDE, we want to compile each individual unity -// .cpp in order to make sure that it builds by itself. An application that -// uses beast will typically include all of these .cpp files in one of its -// own unity .cpp -#if ! BEAST_COMPILING_STATIC_LIBARARY -/* -#include "../../beast/chrono/Chrono.cpp" -#include "../../beast/crypto/Crypto.cpp" -#include "../../beast/http/HTTP.cpp" -#include "../../beast/net/Net.cpp" -#include "../../beast/strings/Strings.cpp" -#include "../../beast/utility/Utility.cpp" -*/ -#endif - // Must be outside the namespace #include "system/BoostPlaceholdersFix.cpp" diff --git a/src/beast/modules/beast_sqdb/beast_sqdb.cpp b/src/beast/modules/beast_sqdb/beast_sqdb.cpp index 9c63cc8d85..84014f81a5 100644 --- a/src/beast/modules/beast_sqdb/beast_sqdb.cpp +++ b/src/beast/modules/beast_sqdb/beast_sqdb.cpp @@ -17,7 +17,9 @@ */ //============================================================================== -#include "BeastConfig.h" +#if BEAST_INCLUDE_BEASTCONFIG +#include "../../BeastConfig.h" +#endif #include "beast_sqdb.h" diff --git a/src/beast/modules/beast_sqlite/beast_sqlite.c b/src/beast/modules/beast_sqlite/beast_sqlite.c index ba827418bb..2961dce574 100644 --- a/src/beast/modules/beast_sqlite/beast_sqlite.c +++ b/src/beast/modules/beast_sqlite/beast_sqlite.c @@ -23,7 +23,9 @@ @ingroup beast_sqlite */ -#include "BeastConfig.h" +#if BEAST_INCLUDE_BEASTCONFIG +#include "../../BeastConfig.h" +#endif // Prevents sqlite.h from being included, since it screws up the .c #define BEAST_SQLITE_CPP_INCLUDED diff --git a/src/beast/modules/beast_sqlite/beast_sqlite.h b/src/beast/modules/beast_sqlite/beast_sqlite.h index 7c6f837757..0f4d678d2c 100644 --- a/src/beast/modules/beast_sqlite/beast_sqlite.h +++ b/src/beast/modules/beast_sqlite/beast_sqlite.h @@ -25,9 +25,6 @@ This external module provides the SQLite embedded database library. SQLite is public domain software, visit http://sqlite.org - - @note To control the use of the native SQLite library on supported platforms, - see BeastConfig.h. */ #include "../../beast/config/PlatformConfig.h" diff --git a/src/beast/notes/1/test.cpp b/src/beast/notes/1/test.cpp deleted file mode 100644 index fc88aea797..0000000000 --- a/src/beast/notes/1/test.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/* - This code normally fails to compile under Visual Studio 2012 - - The fix is marked with _MSC_VER -*/ - -#include -#include - -template struct has_lowest_layer_type { - typedef char yes; - typedef struct {char dummy[2];} no; - template static yes f(typename C::lowest_layer_type*); - template static no f(...); -#ifdef _MSC_VER - static const bool value = sizeof(f(0)) == 1; -#else - static const bool value = sizeof(has_lowest_layer_type::f(0)) == 1; -#endif -}; - -template -struct EnableIf : std::false_type { }; - -template <> -struct EnableIf : std::true_type { }; - -struct tcp { }; - -template -struct basic_socket -{ - typedef basic_socket lowest_layer_type; -}; - -template -struct basic_stream_socket : basic_socket -{ - typedef basic_socket next_layer_type; -}; - -struct A -{ - typedef basic_socket lowest_layer_type; -}; - -struct B -{ -}; - -template -void show (std::true_type) -{ - std::cout << typeid(T).name() << " has lowest_layer_type" << std::endl; -} - -template -void show (std::false_type) -{ - std::cout << typeid(T).name() << " does not have lowest_layer_type" << std::endl; -} - -template -void show () -{ - show (EnableIf ::value> ()); -} - -int main () -{ - show (); - show (); - show > (); - show > (); - return 0; -} -/* -1>..\..\Subtrees\beast\notes\1\test.cpp(16): error C2783: 'has_lowest_layer_type::no has_lowest_layer_type::f(...)' : could not deduce template argument for 'C' -1> with -1> [ -1> T=A -1> ] -1> ..\..\Subtrees\beast\notes\1\test.cpp(15) : see declaration of 'has_lowest_layer_type::f' -1> with -1> [ -1> T=A -1> ] -1> ..\..\Subtrees\beast\notes\1\test.cpp(63) : see reference to class template instantiation 'has_lowest_layer_type' being compiled -1> with -1> [ -1> T=A -1> ] -1> ..\..\Subtrees\beast\notes\1\test.cpp(68) : see reference to function template instantiation 'void show(void)' being compiled -*/ diff --git a/src/ripple/beast/ripple_beast.cpp b/src/ripple/beast/ripple_beast.cpp index c80b01e5c8..36eb156f13 100644 --- a/src/ripple/beast/ripple_beast.cpp +++ b/src/ripple/beast/ripple_beast.cpp @@ -23,7 +23,7 @@ */ // MUST come first! -#include "BeastConfig.h" +#include "../../BeastConfig.h" // Include this to get all the basic includes included, to prevent errors #include "../beast/modules/beast_core/beast_core.h" diff --git a/src/ripple/beast/ripple_beastc.c b/src/ripple/beast/ripple_beastc.c index 8259e43b4b..c4122c5448 100644 --- a/src/ripple/beast/ripple_beastc.c +++ b/src/ripple/beast/ripple_beastc.c @@ -24,7 +24,7 @@ Note that these sources must be compiled using the C compiler. */ -#include "BeastConfig.h" +#include "../../BeastConfig.h" #ifdef __cplusplus #error "Whoops! This file must be compiled with a C compiler!" diff --git a/src/ripple/common/ripple_common.cpp b/src/ripple/common/ripple_common.cpp index 9086436456..fee71b3f2e 100644 --- a/src/ripple/common/ripple_common.cpp +++ b/src/ripple/common/ripple_common.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "../../beast/modules/beast_core/beast_core.h" // for UnitTest diff --git a/src/ripple/http/ripple_http.cpp b/src/ripple/http/ripple_http.cpp index 7cc0a5a34b..012e9ee0ea 100644 --- a/src/ripple/http/ripple_http.cpp +++ b/src/ripple/http/ripple_http.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "ripple_http.h" diff --git a/src/ripple/json/ripple_json.cpp b/src/ripple/json/ripple_json.cpp index a0da37f128..5bbd9ac714 100644 --- a/src/ripple/json/ripple_json.cpp +++ b/src/ripple/json/ripple_json.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include #include diff --git a/src/ripple/peerfinder/ripple_peerfinder.cpp b/src/ripple/peerfinder/ripple_peerfinder.cpp index 2f982d4a8d..ebee802393 100644 --- a/src/ripple/peerfinder/ripple_peerfinder.cpp +++ b/src/ripple/peerfinder/ripple_peerfinder.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "ripple_peerfinder.h" diff --git a/src/ripple/radmap/ripple_radmap.cpp b/src/ripple/radmap/ripple_radmap.cpp index 3d39af294e..a7c17d5e6d 100644 --- a/src/ripple/radmap/ripple_radmap.cpp +++ b/src/ripple/radmap/ripple_radmap.cpp @@ -17,6 +17,6 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "impl/BasicFullBelowCache.cpp" diff --git a/src/ripple/resource/ripple_resource.cpp b/src/ripple/resource/ripple_resource.cpp index 8a5beff7db..df882139d6 100644 --- a/src/ripple/resource/ripple_resource.cpp +++ b/src/ripple/resource/ripple_resource.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "ripple_resource.h" diff --git a/src/ripple/rocksdb/ripple_rocksdb.cpp b/src/ripple/rocksdb/ripple_rocksdb.cpp index 2a73575185..2fc94e45e7 100644 --- a/src/ripple/rocksdb/ripple_rocksdb.cpp +++ b/src/ripple/rocksdb/ripple_rocksdb.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "ripple_rocksdb.h" diff --git a/src/ripple/sitefiles/ripple_sitefiles.cpp b/src/ripple/sitefiles/ripple_sitefiles.cpp index 0c155ceac0..3690882fef 100644 --- a/src/ripple/sitefiles/ripple_sitefiles.cpp +++ b/src/ripple/sitefiles/ripple_sitefiles.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "ripple_sitefiles.h" diff --git a/src/ripple/sslutil/ripple_sslutil.cpp b/src/ripple/sslutil/ripple_sslutil.cpp index 488bff6993..2cbe3def59 100644 --- a/src/ripple/sslutil/ripple_sslutil.cpp +++ b/src/ripple/sslutil/ripple_sslutil.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "ripple_sslutil.h" diff --git a/src/ripple/testoverlay/ripple_testoverlay.cpp b/src/ripple/testoverlay/ripple_testoverlay.cpp index 3a86f5d360..4cfddfd25c 100644 --- a/src/ripple/testoverlay/ripple_testoverlay.cpp +++ b/src/ripple/testoverlay/ripple_testoverlay.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "ripple_testoverlay.h" diff --git a/src/ripple/types/ripple_types.cpp b/src/ripple/types/ripple_types.cpp index d3e1211bfd..499001b5df 100644 --- a/src/ripple/types/ripple_types.cpp +++ b/src/ripple/types/ripple_types.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "ripple_types.h" #include "../ripple/sslutil/ripple_sslutil.h" diff --git a/src/ripple/validators/ripple_validators.cpp b/src/ripple/validators/ripple_validators.cpp index f3ef632116..c705fd312f 100644 --- a/src/ripple/validators/ripple_validators.cpp +++ b/src/ripple/validators/ripple_validators.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "ripple_validators.h" diff --git a/src/ripple_app/ripple_app.cpp b/src/ripple_app/ripple_app.cpp index 61d4a95867..9e9c6ba492 100644 --- a/src/ripple_app/ripple_app.cpp +++ b/src/ripple_app/ripple_app.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "../beast/modules/beast_core/system/BeforeBoost.h" #include diff --git a/src/ripple_app/ripple_app_pt1.cpp b/src/ripple_app/ripple_app_pt1.cpp index ad7db13564..71deff1018 100644 --- a/src/ripple_app/ripple_app_pt1.cpp +++ b/src/ripple_app/ripple_app_pt1.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "../beast/modules/beast_core/system/BeforeBoost.h" #include diff --git a/src/ripple_app/ripple_app_pt2.cpp b/src/ripple_app/ripple_app_pt2.cpp index 32975ef180..3cfab90114 100644 --- a/src/ripple_app/ripple_app_pt2.cpp +++ b/src/ripple_app/ripple_app_pt2.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "ripple_app.h" diff --git a/src/ripple_app/ripple_app_pt3.cpp b/src/ripple_app/ripple_app_pt3.cpp index 857ffee63b..aa7b7e761b 100644 --- a/src/ripple_app/ripple_app_pt3.cpp +++ b/src/ripple_app/ripple_app_pt3.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "ripple_app.h" diff --git a/src/ripple_app/ripple_app_pt4.cpp b/src/ripple_app/ripple_app_pt4.cpp index b141e97381..2496ae1dd1 100644 --- a/src/ripple_app/ripple_app_pt4.cpp +++ b/src/ripple_app/ripple_app_pt4.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "ripple_app.h" diff --git a/src/ripple_app/ripple_app_pt5.cpp b/src/ripple_app/ripple_app_pt5.cpp index e5475de810..d68ea21dd6 100644 --- a/src/ripple_app/ripple_app_pt5.cpp +++ b/src/ripple_app/ripple_app_pt5.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "ripple_app.h" #include "../ripple_net/ripple_net.h" diff --git a/src/ripple_app/ripple_app_pt6.cpp b/src/ripple_app/ripple_app_pt6.cpp index 3ab780f417..6726925276 100644 --- a/src/ripple_app/ripple_app_pt6.cpp +++ b/src/ripple_app/ripple_app_pt6.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "ripple_app.h" diff --git a/src/ripple_app/ripple_app_pt7.cpp b/src/ripple_app/ripple_app_pt7.cpp index 12057ae3d9..d0dfd513e4 100644 --- a/src/ripple_app/ripple_app_pt7.cpp +++ b/src/ripple_app/ripple_app_pt7.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "ripple_app.h" diff --git a/src/ripple_app/ripple_app_pt8.cpp b/src/ripple_app/ripple_app_pt8.cpp index e66c1243b3..003fa2157a 100644 --- a/src/ripple_app/ripple_app_pt8.cpp +++ b/src/ripple_app/ripple_app_pt8.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "ripple_app.h" diff --git a/src/ripple_app/ripple_app_pt9.cpp b/src/ripple_app/ripple_app_pt9.cpp index 849dbc86fc..c308326e93 100644 --- a/src/ripple_app/ripple_app_pt9.cpp +++ b/src/ripple_app/ripple_app_pt9.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "ripple_app.h" diff --git a/src/ripple_basics/ripple_basics.cpp b/src/ripple_basics/ripple_basics.cpp index b1870b3bf7..c5b9aa46b7 100644 --- a/src/ripple_basics/ripple_basics.cpp +++ b/src/ripple_basics/ripple_basics.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "ripple_basics.h" diff --git a/src/ripple_core/ripple_core.cpp b/src/ripple_core/ripple_core.cpp index aed6cbe6bf..95fc3d81e0 100644 --- a/src/ripple_core/ripple_core.cpp +++ b/src/ripple_core/ripple_core.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "ripple_core.h" diff --git a/src/ripple_data/ripple_data.cpp b/src/ripple_data/ripple_data.cpp index 3f97219011..dc52bbb28e 100644 --- a/src/ripple_data/ripple_data.cpp +++ b/src/ripple_data/ripple_data.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "ripple_data.h" diff --git a/src/ripple_hyperleveldb/ripple_hyperleveldb.cpp b/src/ripple_hyperleveldb/ripple_hyperleveldb.cpp index 3c0197569e..39e612a929 100644 --- a/src/ripple_hyperleveldb/ripple_hyperleveldb.cpp +++ b/src/ripple_hyperleveldb/ripple_hyperleveldb.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -// Unity build file for LevelDB +// Unity build file for HyperLevelDB -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "ripple_hyperleveldb.h" diff --git a/src/ripple_leveldb/ripple_leveldb.cpp b/src/ripple_leveldb/ripple_leveldb.cpp index 63d8cd6e6d..c7aa9906ca 100644 --- a/src/ripple_leveldb/ripple_leveldb.cpp +++ b/src/ripple_leveldb/ripple_leveldb.cpp @@ -19,7 +19,7 @@ // Unity build file for LevelDB -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "ripple_leveldb.h" diff --git a/src/ripple_net/ripple_net.cpp b/src/ripple_net/ripple_net.cpp index eeeb36f114..1750b62424 100644 --- a/src/ripple_net/ripple_net.cpp +++ b/src/ripple_net/ripple_net.cpp @@ -23,7 +23,7 @@ @ingroup ripple_net */ -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "../beast/modules/beast_core/system/BeforeBoost.h" #include diff --git a/src/ripple_overlay/ripple_overlay.cpp b/src/ripple_overlay/ripple_overlay.cpp index a9e32f68af..7c74a494cd 100644 --- a/src/ripple_overlay/ripple_overlay.cpp +++ b/src/ripple_overlay/ripple_overlay.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "ripple_overlay.h" diff --git a/src/ripple_rpc/ripple_rpc.cpp b/src/ripple_rpc/ripple_rpc.cpp index caf6260e77..8a511bb6c1 100644 --- a/src/ripple_rpc/ripple_rpc.cpp +++ b/src/ripple_rpc/ripple_rpc.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #include "ripple_rpc.h" diff --git a/src/ripple_websocket/ripple_websocket.cpp b/src/ripple_websocket/ripple_websocket.cpp index b70821ef48..b7460c2999 100644 --- a/src/ripple_websocket/ripple_websocket.cpp +++ b/src/ripple_websocket/ripple_websocket.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "BeastConfig.h" +#include "../../BeastConfig.h" #ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS 1