From 9ef5b4746a404e09daa8538c1193329b58ba0d93 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Wed, 25 Nov 2015 12:21:55 +0100 Subject: [PATCH] removed several includes from Common.h --- arangod/Aql/AstNode.h | 1 + arangod/Aql/ExecutionBlock.h | 2 ++ arangod/Aql/Index.h | 1 + arangod/Aql/Optimizer.h | 4 ++-- arangod/Aql/QueryList.h | 2 ++ arangod/Cluster/AgencyComm.h | 2 ++ arangod/HttpServer/HttpCommTask.h | 2 ++ arangod/Rest/AnyServer.cpp | 2 ++ arangod/Scheduler/SchedulerThread.h | 2 ++ arangod/V8Server/ApplicationV8.cpp | 7 ++----- arangod/VocBase/datafile.cpp | 2 ++ arangosh/ArangoShell/ArangoClient.cpp | 10 ++++++---- config/generateMimetypes.py | 1 + lib/Basics/AssocMulti.h | 2 ++ lib/Basics/AssocUnique.h | 6 ++++-- lib/Basics/AttributeNameParser.h | 1 + lib/Basics/Common.h | 12 ------------ lib/Basics/JsonHelper.h | 1 + lib/Basics/StringBuffer.h | 3 ++- lib/Basics/ThreadPool.h | 2 ++ lib/Basics/Traverser.h | 4 +++- lib/Basics/debugging.h | 2 ++ lib/Basics/init.cpp | 1 + lib/Basics/mimetypes.h | 12 ++++-------- lib/Basics/voc-mimetypes.cpp | 1 + lib/Rest/Version.cpp | 1 + lib/SimpleHttpClient/ConnectionManager.h | 2 ++ lib/V8/v8-shell.cpp | 2 ++ 28 files changed, 55 insertions(+), 35 deletions(-) diff --git a/arangod/Aql/AstNode.h b/arangod/Aql/AstNode.h index b9aabadc49..2f728a713b 100644 --- a/arangod/Aql/AstNode.h +++ b/arangod/Aql/AstNode.h @@ -37,6 +37,7 @@ #include "Basics/JsonHelper.h" #include +#include namespace triagens { namespace basics { diff --git a/arangod/Aql/ExecutionBlock.h b/arangod/Aql/ExecutionBlock.h index 4b9de135c1..d8a2093b64 100644 --- a/arangod/Aql/ExecutionBlock.h +++ b/arangod/Aql/ExecutionBlock.h @@ -31,6 +31,8 @@ #include "Aql/AqlItemBlock.h" #include "Aql/ExecutionNode.h" +#include + namespace triagens { namespace arango { class AqlTransaction; diff --git a/arangod/Aql/Index.h b/arangod/Aql/Index.h index cc57c5718d..8b8d798e6f 100644 --- a/arangod/Aql/Index.h +++ b/arangod/Aql/Index.h @@ -36,6 +36,7 @@ #include "Basics/JsonHelper.h" #include "Indexes/Index.h" #include "Indexes/IndexIterator.h" +#include namespace triagens { namespace aql { diff --git a/arangod/Aql/Optimizer.h b/arangod/Aql/Optimizer.h index dc6580dd11..bb4257f079 100644 --- a/arangod/Aql/Optimizer.h +++ b/arangod/Aql/Optimizer.h @@ -29,11 +29,11 @@ #define ARANGOD_AQL_OPTIMIZER_H 1 #include "Basics/Common.h" +#include "Aql/ExecutionPlan.h" #include "Basics/MutexLocker.h" -#include "Aql/ExecutionPlan.h" - #include +#include namespace triagens { namespace aql { diff --git a/arangod/Aql/QueryList.h b/arangod/Aql/QueryList.h index 4c1ccdf842..19a14c29a8 100644 --- a/arangod/Aql/QueryList.h +++ b/arangod/Aql/QueryList.h @@ -34,6 +34,8 @@ #include "Basics/ReadWriteLock.h" #include "VocBase/voc-types.h" +#include + struct TRI_vocbase_t; namespace triagens { diff --git a/arangod/Cluster/AgencyComm.h b/arangod/Cluster/AgencyComm.h index a0a38e75f8..13e11682a7 100644 --- a/arangod/Cluster/AgencyComm.h +++ b/arangod/Cluster/AgencyComm.h @@ -36,6 +36,8 @@ #include "Basics/json.h" #include "Rest/HttpRequest.h" +#include + namespace triagens { namespace httpclient { class GeneralClientConnection; diff --git a/arangod/HttpServer/HttpCommTask.h b/arangod/HttpServer/HttpCommTask.h index 1c34ac15c1..8c0bba09e9 100644 --- a/arangod/HttpServer/HttpCommTask.h +++ b/arangod/HttpServer/HttpCommTask.h @@ -35,6 +35,8 @@ #include "Basics/StringBuffer.h" #include "Scheduler/SocketTask.h" +#include + namespace triagens { namespace rest { class HttpCommTask; diff --git a/arangod/Rest/AnyServer.cpp b/arangod/Rest/AnyServer.cpp index 3e2fcbcf7d..8d1a587df9 100644 --- a/arangod/Rest/AnyServer.cpp +++ b/arangod/Rest/AnyServer.cpp @@ -43,6 +43,8 @@ #include "Basics/logging.h" #include "Basics/process-utils.h" +#include + using namespace std; using namespace triagens; using namespace triagens::basics; diff --git a/arangod/Scheduler/SchedulerThread.h b/arangod/Scheduler/SchedulerThread.h index 87610d6b85..703c836e94 100644 --- a/arangod/Scheduler/SchedulerThread.h +++ b/arangod/Scheduler/SchedulerThread.h @@ -38,6 +38,8 @@ #include "Scheduler/Task.h" #include "Scheduler/TaskManager.h" +#include + // #define TRI_USE_SPIN_LOCK_SCHEDULER_THREAD 1 // ----------------------------------------------------------------------------- diff --git a/arangod/V8Server/ApplicationV8.cpp b/arangod/V8Server/ApplicationV8.cpp index dfa2c18669..6775775153 100644 --- a/arangod/V8Server/ApplicationV8.cpp +++ b/arangod/V8Server/ApplicationV8.cpp @@ -28,10 +28,6 @@ //////////////////////////////////////////////////////////////////////////////// #include "ApplicationV8.h" -#include - -#include - #include "Actions/actions.h" #include "Aql/QueryRegistry.h" #include "ApplicationServer/ApplicationServer.h" @@ -63,8 +59,9 @@ #include "V8Server/v8-vocbase.h" #include "VocBase/server.h" -#include #include "3rdParty/valgrind/valgrind.h" +#include +#include using namespace triagens; using namespace triagens::basics; diff --git a/arangod/VocBase/datafile.cpp b/arangod/VocBase/datafile.cpp index 002f1aacce..cf80f0f5ee 100644 --- a/arangod/VocBase/datafile.cpp +++ b/arangod/VocBase/datafile.cpp @@ -40,6 +40,8 @@ #include "Basics/tri-strings.h" #include "VocBase/server.h" +#include + // #define DEBUG_DATAFILE 1 using namespace std; diff --git a/arangosh/ArangoShell/ArangoClient.cpp b/arangosh/ArangoShell/ArangoClient.cpp index c4d04aa240..71bcd68574 100644 --- a/arangosh/ArangoShell/ArangoClient.cpp +++ b/arangosh/ArangoShell/ArangoClient.cpp @@ -27,7 +27,6 @@ /// @author Copyright 2012-2013, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -#include #include "ArangoClient.h" #include "Basics/files.h" @@ -39,6 +38,9 @@ #include "Basics/ProgramOptionsDescription.h" #include "Basics/ProgramOptions.h" +#include +#include + using namespace std; using namespace triagens::basics; using namespace triagens::rest; @@ -404,9 +406,9 @@ void ArangoClient::parse (ProgramOptions& options, if (! help.empty()) { if (! example.empty()) { - cout << "USAGE: " << argv[0] << " " << example << endl << endl; + std::cout << "USAGE: " << argv[0] << " " << example << endl << endl; } - cout << description.usage(help) << endl; + std::cout << description.usage(help) << endl; // check for program-specific help std::string const progname(argv[0]); @@ -414,7 +416,7 @@ void ArangoClient::parse (ProgramOptions& options, progname.size() >= _specificHelp.progname.size() && progname.substr(progname.size() - _specificHelp.progname.size(), _specificHelp.progname.size()) == _specificHelp.progname) { // found a program-specific help - cout << _specificHelp.message << endl; + std::cout << _specificHelp.message << endl; } // --help always returns success diff --git a/config/generateMimetypes.py b/config/generateMimetypes.py index 1da13d841a..f9de759c5f 100755 --- a/config/generateMimetypes.py +++ b/config/generateMimetypes.py @@ -97,6 +97,7 @@ def genCFile(types, filename): impl = prologue\ + "#include \"Basics/Common.h\"\n"\ + + "#include \"Basics/mimetypes.h\"\n"\ + "#include \"" + headerfile + "\"\n"\ + "\n"\ + "////////////////////////////////////////////////////////////////////////////////\n"\ diff --git a/lib/Basics/AssocMulti.h b/lib/Basics/AssocMulti.h index 65211f1e2a..f00a7afc77 100644 --- a/lib/Basics/AssocMulti.h +++ b/lib/Basics/AssocMulti.h @@ -43,6 +43,8 @@ #include "Basics/MutexLocker.h" #include "Basics/prime-numbers.h" +#include + namespace triagens { namespace basics { diff --git a/lib/Basics/AssocUnique.h b/lib/Basics/AssocUnique.h index acc2e74cb1..49381ec0b7 100644 --- a/lib/Basics/AssocUnique.h +++ b/lib/Basics/AssocUnique.h @@ -29,8 +29,8 @@ /// @author Copyright 2006-2013, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -#ifndef ARANGODB_HASH_INDEX_HASH__ARRAY_H -#define ARANGODB_HASH_INDEX_HASH__ARRAY_H 1 +#ifndef ARANGODB_BASICS_ASSOC_UNIQUE_H +#define ARANGODB_BASICS_ASSOC_UNIQUE_H 1 #include "Basics/Common.h" #include "Basics/gcd.h" @@ -41,6 +41,8 @@ #include "Basics/prime-numbers.h" #include "Basics/random.h" +#include + namespace triagens { namespace basics { diff --git a/lib/Basics/AttributeNameParser.h b/lib/Basics/AttributeNameParser.h index 06963dc0f0..dfd577d31e 100644 --- a/lib/Basics/AttributeNameParser.h +++ b/lib/Basics/AttributeNameParser.h @@ -32,6 +32,7 @@ #define ARANGODB_BASICS_ATTRIBUTENAMEPARSER_H 1 #include "Common.h" +#include namespace triagens { namespace basics { diff --git a/lib/Basics/Common.h b/lib/Basics/Common.h index 76c6d7dc59..f1aa6cc68b 100644 --- a/lib/Basics/Common.h +++ b/lib/Basics/Common.h @@ -130,26 +130,15 @@ typedef long suseconds_t; // ----------------------------------------------------------------------------- #include -#include -#include #include -#include #include -#include -#include -#include #include #include - // C++11!! -#include #include #include #include #include -#include -#include -#include // ----------------------------------------------------------------------------- // --SECTION-- basic triAGENS headers @@ -160,7 +149,6 @@ typedef long suseconds_t; #include "Basics/error.h" #include "Basics/debugging.h" #include "Basics/memory.h" -#include "Basics/mimetypes.h" #include "Basics/structures.h" #undef TRI_WITHIN_COMMON diff --git a/lib/Basics/JsonHelper.h b/lib/Basics/JsonHelper.h index b4866fe1ee..5773e924fb 100644 --- a/lib/Basics/JsonHelper.h +++ b/lib/Basics/JsonHelper.h @@ -34,6 +34,7 @@ #include "Basics/Exceptions.h" #include "Basics/json.h" #include "Basics/StringBuffer.h" +#include namespace triagens { namespace basics { diff --git a/lib/Basics/StringBuffer.h b/lib/Basics/StringBuffer.h index 21d8969e3c..e2d5c353b4 100644 --- a/lib/Basics/StringBuffer.h +++ b/lib/Basics/StringBuffer.h @@ -39,10 +39,11 @@ #include "Basics/Common.h" #include "Basics/Exceptions.h" - #include "Basics/string-buffer.h" #include "Zip/zip.h" +#include + // ----------------------------------------------------------------------------- // string buffer with formatting routines // ----------------------------------------------------------------------------- diff --git a/lib/Basics/ThreadPool.h b/lib/Basics/ThreadPool.h index 5c803140c1..ca7b1748eb 100644 --- a/lib/Basics/ThreadPool.h +++ b/lib/Basics/ThreadPool.h @@ -34,7 +34,9 @@ #include "Basics/ConditionLocker.h" #include "Basics/ConditionVariable.h" #include "Basics/Mutex.h" + #include +#include namespace triagens { namespace basics { diff --git a/lib/Basics/Traverser.h b/lib/Basics/Traverser.h index 86eac71b7f..41e003c0d2 100644 --- a/lib/Basics/Traverser.h +++ b/lib/Basics/Traverser.h @@ -34,8 +34,10 @@ #include "Basics/Exceptions.h" #include "Basics/hashes.h" -#include +#include #include +#include +#include namespace triagens { namespace basics { diff --git a/lib/Basics/debugging.h b/lib/Basics/debugging.h index 96ed92d9bb..97a00e5eff 100644 --- a/lib/Basics/debugging.h +++ b/lib/Basics/debugging.h @@ -34,6 +34,8 @@ #error use #endif +#include + // ----------------------------------------------------------------------------- // --SECTION-- public defines // ----------------------------------------------------------------------------- diff --git a/lib/Basics/init.cpp b/lib/Basics/init.cpp index a59c414aba..f480285043 100644 --- a/lib/Basics/init.cpp +++ b/lib/Basics/init.cpp @@ -32,6 +32,7 @@ #include "Basics/files.h" #include "Basics/hashes.h" #include "Basics/logging.h" +#include "Basics/mimetypes.h" #include "Basics/process-utils.h" #include "Basics/random.h" diff --git a/lib/Basics/mimetypes.h b/lib/Basics/mimetypes.h index 636792cb45..e012edd7c4 100644 --- a/lib/Basics/mimetypes.h +++ b/lib/Basics/mimetypes.h @@ -30,10 +30,6 @@ #ifndef ARANGODB_BASICS_C_MIMETYPES_H #define ARANGODB_BASICS_C_MIMETYPES_H 1 -#ifndef TRI_WITHIN_COMMON -#error use -#endif - // ----------------------------------------------------------------------------- // --SECTION-- public types // ----------------------------------------------------------------------------- @@ -46,13 +42,13 @@ /// @brief register a mimetype for an extension //////////////////////////////////////////////////////////////////////////////// -bool TRI_RegisterMimetype (const char*, const char*, bool); +bool TRI_RegisterMimetype (char const*, char const*, bool); //////////////////////////////////////////////////////////////////////////////// /// @brief gets the mimetype for an extension //////////////////////////////////////////////////////////////////////////////// -char* TRI_GetMimetype (const char*); +char* TRI_GetMimetype (char const*); // ----------------------------------------------------------------------------- // --SECTION-- MODULE @@ -66,13 +62,13 @@ char* TRI_GetMimetype (const char*); /// @brief initializes mimetypes //////////////////////////////////////////////////////////////////////////////// -void TRI_InitializeMimetypes (void); +void TRI_InitializeMimetypes (); //////////////////////////////////////////////////////////////////////////////// /// @brief shuts down mimetypes //////////////////////////////////////////////////////////////////////////////// -void TRI_ShutdownMimetypes (void); +void TRI_ShutdownMimetypes (); #endif diff --git a/lib/Basics/voc-mimetypes.cpp b/lib/Basics/voc-mimetypes.cpp index 70cf274cab..eb582b153d 100644 --- a/lib/Basics/voc-mimetypes.cpp +++ b/lib/Basics/voc-mimetypes.cpp @@ -3,6 +3,7 @@ //////////////////////////////////////////////////////////////////////////////// #include "Basics/Common.h" +#include "Basics/mimetypes.h" #include "./lib/Basics/voc-mimetypes.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/lib/Rest/Version.cpp b/lib/Rest/Version.cpp index c18832b4c6..7ed6e01f9f 100644 --- a/lib/Rest/Version.cpp +++ b/lib/Rest/Version.cpp @@ -39,6 +39,7 @@ #include "Basics/Utf8Helper.h" #include +#include using namespace triagens::rest; diff --git a/lib/SimpleHttpClient/ConnectionManager.h b/lib/SimpleHttpClient/ConnectionManager.h index 7b9b70909d..e738147ef7 100644 --- a/lib/SimpleHttpClient/ConnectionManager.h +++ b/lib/SimpleHttpClient/ConnectionManager.h @@ -33,6 +33,8 @@ #include "Basics/ReadWriteLock.h" #include "SimpleHttpClient/GeneralClientConnection.h" +#include + // TODO: change to constexpr when feasible #define CONNECTION_MANAGER_BUCKETS 8 diff --git a/lib/V8/v8-shell.cpp b/lib/V8/v8-shell.cpp index 125c504061..178b1cbc70 100644 --- a/lib/V8/v8-shell.cpp +++ b/lib/V8/v8-shell.cpp @@ -41,6 +41,8 @@ #include "V8/v8-json.h" #include "V8/v8-utils.h" +#include + using namespace std; // -----------------------------------------------------------------------------