From 122f1c54e2640a63be9e34f18045cc1fbf227d0e Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Thu, 27 Jun 2013 19:44:46 -0700 Subject: [PATCH] Uniform include of BeastConfig.h --- modules/ripple_app/ripple_app.cpp | 4 ++-- modules/ripple_basics/ripple_basics.cpp | 2 ++ modules/ripple_basics/ripple_basics.h | 2 -- modules/ripple_core/ripple_core.cpp | 2 ++ modules/ripple_data/ripple_data.cpp | 2 ++ modules/ripple_json/ripple_json.cpp | 2 ++ modules/ripple_leveldb/ripple_leveldb.cpp | 2 ++ modules/ripple_sqlite/ripple_sqlite.c | 2 ++ modules/ripple_websocket/ripple_websocket.cpp | 2 ++ 9 files changed, 16 insertions(+), 4 deletions(-) diff --git a/modules/ripple_app/ripple_app.cpp b/modules/ripple_app/ripple_app.cpp index b0cb6ea470..69689b9161 100644 --- a/modules/ripple_app/ripple_app.cpp +++ b/modules/ripple_app/ripple_app.cpp @@ -12,6 +12,8 @@ //------------------------------------------------------------------------------ +#include "BeastConfig.h" + // VFALCO NOTE Holy smokes...that's a lot of boost!!! #include #include @@ -71,8 +73,6 @@ #include "../ripple_data/ripple_data.h" - - #include "../modules/ripple_websocket/ripple_websocket.h" //------------------------------------------------------------------------------ diff --git a/modules/ripple_basics/ripple_basics.cpp b/modules/ripple_basics/ripple_basics.cpp index bfe86eb8f7..1fa03c5901 100644 --- a/modules/ripple_basics/ripple_basics.cpp +++ b/modules/ripple_basics/ripple_basics.cpp @@ -10,6 +10,8 @@ @ingroup ripple_basics */ +#include "BeastConfig.h" + #include "ripple_basics.h" // VFALCO TODO Rewrite Sustain to use beast::Process diff --git a/modules/ripple_basics/ripple_basics.h b/modules/ripple_basics/ripple_basics.h index 5c605e5882..aed5004a9d 100644 --- a/modules/ripple_basics/ripple_basics.h +++ b/modules/ripple_basics/ripple_basics.h @@ -37,8 +37,6 @@ # include #endif -#include "BeastConfig.h" // Must come before any Beast includes - #include "modules/beast_core/beast_core.h" #include "modules/beast_basics/beast_basics.h" diff --git a/modules/ripple_core/ripple_core.cpp b/modules/ripple_core/ripple_core.cpp index 3116573ac2..96b4a79e13 100644 --- a/modules/ripple_core/ripple_core.cpp +++ b/modules/ripple_core/ripple_core.cpp @@ -10,6 +10,8 @@ @ingroup ripple_core */ +#include "BeastConfig.h" + #include "ripple_core.h" #include diff --git a/modules/ripple_data/ripple_data.cpp b/modules/ripple_data/ripple_data.cpp index 8a8c37f618..516652b179 100644 --- a/modules/ripple_data/ripple_data.cpp +++ b/modules/ripple_data/ripple_data.cpp @@ -10,6 +10,8 @@ @ingroup ripple_data */ +#include "BeastConfig.h" + #include "ripple_data.h" #include diff --git a/modules/ripple_json/ripple_json.cpp b/modules/ripple_json/ripple_json.cpp index 9c2bbc7038..419905dcc7 100644 --- a/modules/ripple_json/ripple_json.cpp +++ b/modules/ripple_json/ripple_json.cpp @@ -10,6 +10,8 @@ @ingroup ripple_json */ +#include "BeastConfig.h" + #include "ripple_json.h" #include diff --git a/modules/ripple_leveldb/ripple_leveldb.cpp b/modules/ripple_leveldb/ripple_leveldb.cpp index ed230e1945..abc46ef9f8 100644 --- a/modules/ripple_leveldb/ripple_leveldb.cpp +++ b/modules/ripple_leveldb/ripple_leveldb.cpp @@ -6,6 +6,8 @@ // Unity build file for LevelDB +#include "BeastConfig.h" + #include "ripple_leveldb.h" #include "beast/modules/beast_core/system/beast_TargetPlatform.h" diff --git a/modules/ripple_sqlite/ripple_sqlite.c b/modules/ripple_sqlite/ripple_sqlite.c index 6da2c4012c..ae8c03ab18 100644 --- a/modules/ripple_sqlite/ripple_sqlite.c +++ b/modules/ripple_sqlite/ripple_sqlite.c @@ -10,6 +10,8 @@ @ingroup ripple_sqlite */ +#include "BeastConfig.h" + // This prevents sqlite.h from being included // #define RIPPLE_SQLITE_MODULE_INCLUDED 1 diff --git a/modules/ripple_websocket/ripple_websocket.cpp b/modules/ripple_websocket/ripple_websocket.cpp index 4785cb9650..402f4c81f3 100644 --- a/modules/ripple_websocket/ripple_websocket.cpp +++ b/modules/ripple_websocket/ripple_websocket.cpp @@ -4,6 +4,8 @@ */ //============================================================================== +#include "BeastConfig.h" + #ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS 1 #endif