From c733eb6e43c8f11d2478285d93787e6f656afc97 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Thu, 19 Sep 2013 09:00:48 -0700 Subject: [PATCH] Move TargetPlatform.h to beast/Config.h --- src/beast/Builds/VisualStudio2012/beast.vcxproj | 2 +- src/beast/Builds/VisualStudio2012/beast.vcxproj.filters | 6 +++--- .../beast_core/system/TargetPlatform.h => beast/Config.h} | 6 ++++-- src/beast/modules/beast_core/beast_core.h | 2 +- src/beast/modules/beast_core/native/BasicNativeHeaders.h | 3 ++- src/beast/modules/beast_core/system/BeforeBoost.h | 2 +- src/beast/modules/beast_sqlite/beast_sqlite.h | 2 +- src/ripple_hyperleveldb/ripple_hyperleveldb.h | 2 +- src/ripple_leveldb/ripple_leveldb.cpp | 2 +- src/ripple_mdb/ripple_mdb.h | 2 +- 10 files changed, 16 insertions(+), 13 deletions(-) rename src/beast/{modules/beast_core/system/TargetPlatform.h => beast/Config.h} (98%) diff --git a/src/beast/Builds/VisualStudio2012/beast.vcxproj b/src/beast/Builds/VisualStudio2012/beast.vcxproj index 09664a9b45..a22b26c16b 100644 --- a/src/beast/Builds/VisualStudio2012/beast.vcxproj +++ b/src/beast/Builds/VisualStudio2012/beast.vcxproj @@ -69,6 +69,7 @@ + @@ -244,7 +245,6 @@ - diff --git a/src/beast/Builds/VisualStudio2012/beast.vcxproj.filters b/src/beast/Builds/VisualStudio2012/beast.vcxproj.filters index fd4484bb37..18657906b7 100644 --- a/src/beast/Builds/VisualStudio2012/beast.vcxproj.filters +++ b/src/beast/Builds/VisualStudio2012/beast.vcxproj.filters @@ -807,9 +807,6 @@ beast_core\system - - beast_core\system - beast_core\containers @@ -1041,6 +1038,9 @@ beast\net + + beast + diff --git a/src/beast/modules/beast_core/system/TargetPlatform.h b/src/beast/beast/Config.h similarity index 98% rename from src/beast/modules/beast_core/system/TargetPlatform.h rename to src/beast/beast/Config.h index 2cb46c333e..d67089d4cd 100644 --- a/src/beast/modules/beast_core/system/TargetPlatform.h +++ b/src/beast/beast/Config.h @@ -21,8 +21,10 @@ */ //============================================================================== -#ifndef BEAST_CORE_TARGETPLATFORM_H_INCLUDED -#define BEAST_CORE_TARGETPLATFORM_H_INCLUDED +#ifndef BEAST_CONFIG_H_INCLUDED +#define BEAST_CONFIG_H_INCLUDED + +// VFALCO NOTE this is analogous to //============================================================================== /* This file figures out which platform is being built, and defines some macros diff --git a/src/beast/modules/beast_core/beast_core.h b/src/beast/modules/beast_core/beast_core.h index c7834a0040..c6943aab03 100644 --- a/src/beast/modules/beast_core/beast_core.h +++ b/src/beast/modules/beast_core/beast_core.h @@ -173,7 +173,7 @@ Some files contain portions of these external projects, licensed separately: */ // TargetPlatform.h should not use anything from BeastConfig.h -#include "system/TargetPlatform.h" +#include "../../beast/Config.h" #include "system/BeastConfigCheck.h" # include "system/BeforeBoost.h" diff --git a/src/beast/modules/beast_core/native/BasicNativeHeaders.h b/src/beast/modules/beast_core/native/BasicNativeHeaders.h index dae1b669a4..e20e4fd0bc 100644 --- a/src/beast/modules/beast_core/native/BasicNativeHeaders.h +++ b/src/beast/modules/beast_core/native/BasicNativeHeaders.h @@ -24,7 +24,8 @@ #ifndef BEAST_BASICNATIVEHEADERS_H_INCLUDED #define BEAST_BASICNATIVEHEADERS_H_INCLUDED -#include "../system/TargetPlatform.h" +#include "../../../beast/Config.h" + #undef T //============================================================================== diff --git a/src/beast/modules/beast_core/system/BeforeBoost.h b/src/beast/modules/beast_core/system/BeforeBoost.h index a314cc6677..2cf22d58af 100644 --- a/src/beast/modules/beast_core/system/BeforeBoost.h +++ b/src/beast/modules/beast_core/system/BeforeBoost.h @@ -21,7 +21,7 @@ #define BEAST_CORE_SYSTEM_BEFOREBOOST_H_INCLUDED // TargetPlatform.h should not use anything from BeastConfig.h -#include "TargetPlatform.h" +#include "../../../beast/Config.h" #include "BeastConfigCheck.h" // This file should be included before including any boost headers. diff --git a/src/beast/modules/beast_sqlite/beast_sqlite.h b/src/beast/modules/beast_sqlite/beast_sqlite.h index 4dff289446..1c1b5c6152 100644 --- a/src/beast/modules/beast_sqlite/beast_sqlite.h +++ b/src/beast/modules/beast_sqlite/beast_sqlite.h @@ -30,7 +30,7 @@ see BeastConfig.h. */ -#include "../beast_core/system/TargetPlatform.h" +#include "../../../beast/beast/Config.h" #if BEAST_IOS || BEAST_MAC # define BEAST_HAVE_NATIVE_SQLITE 1 diff --git a/src/ripple_hyperleveldb/ripple_hyperleveldb.h b/src/ripple_hyperleveldb/ripple_hyperleveldb.h index 83eaedd19d..5caa4e2044 100644 --- a/src/ripple_hyperleveldb/ripple_hyperleveldb.h +++ b/src/ripple_hyperleveldb/ripple_hyperleveldb.h @@ -7,7 +7,7 @@ #ifndef RIPPLE_HYPERLEVELDB_RIPPLEHEADER #define RIPPLE_HYPERLEVELDB_RIPPLEHEADER -#include "beast/modules/beast_core/system/TargetPlatform.h" +#include "beast/beast/Config.h" #if ! BEAST_WIN32 diff --git a/src/ripple_leveldb/ripple_leveldb.cpp b/src/ripple_leveldb/ripple_leveldb.cpp index 4e2329217c..decc79aa2f 100644 --- a/src/ripple_leveldb/ripple_leveldb.cpp +++ b/src/ripple_leveldb/ripple_leveldb.cpp @@ -10,7 +10,7 @@ #include "ripple_leveldb.h" -#include "beast/modules/beast_core/system/TargetPlatform.h" +#include "beast/beast/Config.h" // Set the appropriate LevelDB platform macro based on our platform. // diff --git a/src/ripple_mdb/ripple_mdb.h b/src/ripple_mdb/ripple_mdb.h index 683d545211..6547611e7d 100644 --- a/src/ripple_mdb/ripple_mdb.h +++ b/src/ripple_mdb/ripple_mdb.h @@ -7,7 +7,7 @@ #ifndef RIPPLE_MDB_H_INCLUDED #define RIPPLE_MDB_H_INCLUDED -#include "beast/modules/beast_core/system/TargetPlatform.h" +#include "beast/beast/Config.h" #if ! BEAST_WIN32 #define RIPPLE_MDB_AVAILABLE 1