diff --git a/arangod/Actions/RestActionHandler.h b/arangod/Actions/RestActionHandler.h index c8612ae6dc..6c8558d693 100644 --- a/arangod/Actions/RestActionHandler.h +++ b/arangod/Actions/RestActionHandler.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_ACTIONS_REST_ACTION_HANDLER_H #define TRIAGENS_ACTIONS_REST_ACTION_HANDLER_H 1 +#include "Basics/Common.h" + #include "RestHandler/RestVocbaseBaseHandler.h" #include "Actions/actions.h" diff --git a/arangod/Ahuacatl/ahuacatl-access-optimiser.h b/arangod/Ahuacatl/ahuacatl-access-optimiser.h index 564b3d45fb..305eba3a92 100644 --- a/arangod/Ahuacatl/ahuacatl-access-optimiser.h +++ b/arangod/Ahuacatl/ahuacatl-access-optimiser.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_AHUACATL_AHUACATL_ACCESS_OPTIMISER_H #define TRIAGENS_AHUACATL_AHUACATL_ACCESS_OPTIMISER_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/string-buffer.h" #include "Ahuacatl/ahuacatl-ast-node.h" diff --git a/arangod/Ahuacatl/ahuacatl-ast-node.h b/arangod/Ahuacatl/ahuacatl-ast-node.h index 33f00e0a4d..0ab8df5202 100644 --- a/arangod/Ahuacatl/ahuacatl-ast-node.h +++ b/arangod/Ahuacatl/ahuacatl-ast-node.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_AHUACATL_AHUACATL_AST_NODE_H #define TRIAGENS_AHUACATL_AHUACATL_AST_NODE_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "Ahuacatl/ahuacatl-node.h" diff --git a/arangod/Ahuacatl/ahuacatl-bind-parameter.h b/arangod/Ahuacatl/ahuacatl-bind-parameter.h index a6d6a261bb..475a35e434 100644 --- a/arangod/Ahuacatl/ahuacatl-bind-parameter.h +++ b/arangod/Ahuacatl/ahuacatl-bind-parameter.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_AHUACATL_AHUACATL_BIND_PARAMETER_H #define TRIAGENS_AHUACATL_AHUACATL_BIND_PARAMETER_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/tri-strings.h" #include "BasicsC/hashes.h" #include "BasicsC/vector.h" diff --git a/arangod/Ahuacatl/ahuacatl-codegen.h b/arangod/Ahuacatl/ahuacatl-codegen.h index 2a79bd1d3f..1fd584ffbb 100644 --- a/arangod/Ahuacatl/ahuacatl-codegen.h +++ b/arangod/Ahuacatl/ahuacatl-codegen.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_AHUACATL_AHUACATL_CODEGEN_H #define TRIAGENS_AHUACATL_AHUACATL_CODEGEN_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/associative.h" #include "BasicsC/conversions.h" #include "BasicsC/tri-strings.h" diff --git a/arangod/Ahuacatl/ahuacatl-collections.h b/arangod/Ahuacatl/ahuacatl-collections.h index 9715cffa98..311cbb5f3d 100644 --- a/arangod/Ahuacatl/ahuacatl-collections.h +++ b/arangod/Ahuacatl/ahuacatl-collections.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_AHUACATL_AHUACATL_COLLECTIONS_H #define TRIAGENS_AHUACATL_AHUACATL_COLLECTIONS_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/vector.h" #include "VocBase/vocbase.h" diff --git a/arangod/Ahuacatl/ahuacatl-context.h b/arangod/Ahuacatl/ahuacatl-context.h index 3c2c9e2b81..dd28c8d788 100644 --- a/arangod/Ahuacatl/ahuacatl-context.h +++ b/arangod/Ahuacatl/ahuacatl-context.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_AHUACATL_AHUACATL_CONTEXT_H #define TRIAGENS_AHUACATL_AHUACATL_CONTEXT_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/associative.h" #include "BasicsC/vector.h" diff --git a/arangod/Ahuacatl/ahuacatl-conversions.h b/arangod/Ahuacatl/ahuacatl-conversions.h index ba10074cba..f9e8d3b2e5 100644 --- a/arangod/Ahuacatl/ahuacatl-conversions.h +++ b/arangod/Ahuacatl/ahuacatl-conversions.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_AHUACATL_AHUACATL_CONVERSIONS_H #define TRIAGENS_AHUACATL_AHUACATL_CONVERSIONS_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "Ahuacatl/ahuacatl-ast-node.h" diff --git a/arangod/Ahuacatl/ahuacatl-error.h b/arangod/Ahuacatl/ahuacatl-error.h index d543837567..fcd8c22d5c 100644 --- a/arangod/Ahuacatl/ahuacatl-error.h +++ b/arangod/Ahuacatl/ahuacatl-error.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_AHUACATL_AHUACATL_ERROR_H #define TRIAGENS_AHUACATL_AHUACATL_ERROR_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" // ----------------------------------------------------------------------------- // --SECTION-- public types diff --git a/arangod/Ahuacatl/ahuacatl-explain.h b/arangod/Ahuacatl/ahuacatl-explain.h index ca7a532883..8698915852 100644 --- a/arangod/Ahuacatl/ahuacatl-explain.h +++ b/arangod/Ahuacatl/ahuacatl-explain.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_AHUACATL_AHUACATL_EXPLAIN_H #define TRIAGENS_AHUACATL_AHUACATL_EXPLAIN_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" struct TRI_aql_context_s; struct TRI_json_s; diff --git a/arangod/Ahuacatl/ahuacatl-functions.h b/arangod/Ahuacatl/ahuacatl-functions.h index 8ad5cf46d3..1b94e2092f 100644 --- a/arangod/Ahuacatl/ahuacatl-functions.h +++ b/arangod/Ahuacatl/ahuacatl-functions.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_AHUACATL_AHUACATL_FUNCTIONS_H #define TRIAGENS_AHUACATL_AHUACATL_FUNCTIONS_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "Ahuacatl/ahuacatl-ast-node.h" diff --git a/arangod/Ahuacatl/ahuacatl-grammar.yy b/arangod/Ahuacatl/ahuacatl-grammar.yy index 7ce89153c8..1a9d03f6ef 100644 --- a/arangod/Ahuacatl/ahuacatl-grammar.yy +++ b/arangod/Ahuacatl/ahuacatl-grammar.yy @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/arangod/Ahuacatl/ahuacatl-index.h b/arangod/Ahuacatl/ahuacatl-index.h index f606177644..01d5c657ed 100644 --- a/arangod/Ahuacatl/ahuacatl-index.h +++ b/arangod/Ahuacatl/ahuacatl-index.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_AHUACATL_AHUACATL_INDEX_H #define TRIAGENS_AHUACATL_AHUACATL_INDEX_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/vector.h" #include "VocBase/index.h" diff --git a/arangod/Ahuacatl/ahuacatl-node.h b/arangod/Ahuacatl/ahuacatl-node.h index 0450e6fbd9..72226e6751 100644 --- a/arangod/Ahuacatl/ahuacatl-node.h +++ b/arangod/Ahuacatl/ahuacatl-node.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_AHUACATL_AHUACATL_NODE_H #define TRIAGENS_AHUACATL_AHUACATL_NODE_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/vector.h" // ----------------------------------------------------------------------------- diff --git a/arangod/Ahuacatl/ahuacatl-optimiser.h b/arangod/Ahuacatl/ahuacatl-optimiser.h index a317c21905..9910698db6 100644 --- a/arangod/Ahuacatl/ahuacatl-optimiser.h +++ b/arangod/Ahuacatl/ahuacatl-optimiser.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_AHUACATL_AHUACATL_OPTIMISER_H #define TRIAGENS_AHUACATL_AHUACATL_OPTIMISER_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" struct TRI_aql_context_s; diff --git a/arangod/Ahuacatl/ahuacatl-parser-functions.h b/arangod/Ahuacatl/ahuacatl-parser-functions.h index 6ae77a2450..06eeee70ab 100644 --- a/arangod/Ahuacatl/ahuacatl-parser-functions.h +++ b/arangod/Ahuacatl/ahuacatl-parser-functions.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_AHUACATL_AHUACATL_PARSER_FUNCTIONS_H #define TRIAGENS_AHUACATL_AHUACATL_PARSER_FUNCTIONS_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "Ahuacatl/ahuacatl-context.h" #include "Ahuacatl/ahuacatl-error.h" diff --git a/arangod/Ahuacatl/ahuacatl-parser.h b/arangod/Ahuacatl/ahuacatl-parser.h index e9a045469d..2487f9ff6b 100644 --- a/arangod/Ahuacatl/ahuacatl-parser.h +++ b/arangod/Ahuacatl/ahuacatl-parser.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_AHUACATL_AHUACATL_PARSER_H #define TRIAGENS_AHUACATL_AHUACATL_PARSER_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/vector.h" // ----------------------------------------------------------------------------- diff --git a/arangod/Ahuacatl/ahuacatl-result.h b/arangod/Ahuacatl/ahuacatl-result.h index 6a1d55680a..b553d71ab8 100644 --- a/arangod/Ahuacatl/ahuacatl-result.h +++ b/arangod/Ahuacatl/ahuacatl-result.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_AHUACATL_AHUACATL_RESULT_H #define TRIAGENS_AHUACATL_AHUACATL_RESULT_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/logging.h" #include "BasicsC/json.h" diff --git a/arangod/Ahuacatl/ahuacatl-scope.h b/arangod/Ahuacatl/ahuacatl-scope.h index 90c64b9b2a..f401dc371e 100644 --- a/arangod/Ahuacatl/ahuacatl-scope.h +++ b/arangod/Ahuacatl/ahuacatl-scope.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_AHUACATL_AHUACATL_SCOPE_H #define TRIAGENS_AHUACATL_AHUACATL_SCOPE_H 1 +#include "Basics/Common.h" + #include "BasicsC/associative.h" #include "BasicsC/vector.h" diff --git a/arangod/Ahuacatl/ahuacatl-statement-dump.h b/arangod/Ahuacatl/ahuacatl-statement-dump.h index b7ffe8710e..9bc1c7af51 100644 --- a/arangod/Ahuacatl/ahuacatl-statement-dump.h +++ b/arangod/Ahuacatl/ahuacatl-statement-dump.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_AHUACATL_AHUACATL_STATEMENT_DUMP_H #define TRIAGENS_AHUACATL_AHUACATL_STATEMENT_DUMP_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" struct TRI_aql_statement_list_s; diff --git a/arangod/Ahuacatl/ahuacatl-statement-walker.h b/arangod/Ahuacatl/ahuacatl-statement-walker.h index ef54be104e..6454b41cc8 100644 --- a/arangod/Ahuacatl/ahuacatl-statement-walker.h +++ b/arangod/Ahuacatl/ahuacatl-statement-walker.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_AHUACATL_AHUACATL_STATEMENT_WALKER_H #define TRIAGENS_AHUACATL_AHUACATL_STATEMENT_WALKER_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/vector.h" #include "Ahuacatl/ahuacatl-ast-node.h" diff --git a/arangod/Ahuacatl/ahuacatl-statementlist.h b/arangod/Ahuacatl/ahuacatl-statementlist.h index f4b792fdcd..f2b3df36aa 100644 --- a/arangod/Ahuacatl/ahuacatl-statementlist.h +++ b/arangod/Ahuacatl/ahuacatl-statementlist.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_AHUACATL_AHUACATL_STATEMENTLIST_H #define TRIAGENS_AHUACATL_AHUACATL_STATEMENTLIST_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/vector.h" struct TRI_aql_node_s; diff --git a/arangod/Ahuacatl/ahuacatl-variable.h b/arangod/Ahuacatl/ahuacatl-variable.h index c5d3cbccb2..fe28457124 100644 --- a/arangod/Ahuacatl/ahuacatl-variable.h +++ b/arangod/Ahuacatl/ahuacatl-variable.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_AHUACATL_AHUACATL_VARIABLE_H #define TRIAGENS_AHUACATL_AHUACATL_VARIABLE_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/tri-strings.h" #include "BasicsC/hashes.h" #include "BasicsC/vector.h" diff --git a/arangod/BitIndexes/bitarrayIndex.h b/arangod/BitIndexes/bitarrayIndex.h index 678cdbf1cc..f3a95bd8b3 100644 --- a/arangod/BitIndexes/bitarrayIndex.h +++ b/arangod/BitIndexes/bitarrayIndex.h @@ -28,15 +28,11 @@ #ifndef TRIAGENS_BIT_INDEXES_BITARRAY_INDEX_H #define TRIAGENS_BIT_INDEXES_BITARRAY_INDEX_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "IndexIterators/index-iterator.h" #include "IndexOperators/index-operator.h" #include "ShapedJson/shaped-json.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- forward declaration // ----------------------------------------------------------------------------- @@ -119,10 +115,6 @@ int BitarrayIndex_update (BitarrayIndex*, TRI_bitarray_index_key_t*, TRI_bitarra /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/BitIndexes/masterblocktable.h b/arangod/BitIndexes/masterblocktable.h index 9f739a6e6b..8d6f20417e 100644 --- a/arangod/BitIndexes/masterblocktable.h +++ b/arangod/BitIndexes/masterblocktable.h @@ -37,10 +37,6 @@ #include "IndexIterators/index-iterator.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- bitarray private types // ----------------------------------------------------------------------------- @@ -616,11 +612,6 @@ static int64_t compareIndexOf(MasterTable_t* mt, size_t item, bool* equality) { /// @} //////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/CMakeLists.txt b/arangod/CMakeLists.txt index 6f4ccfa963..a0156ab272 100644 --- a/arangod/CMakeLists.txt +++ b/arangod/CMakeLists.txt @@ -46,29 +46,29 @@ add_executable( ${BIN_ARANGOD} Actions/actions.cpp Actions/RestActionHandler.cpp - Ahuacatl/ahuacatl-access-optimiser.c - Ahuacatl/ahuacatl-ast-node.c - Ahuacatl/ahuacatl-bind-parameter.c - Ahuacatl/ahuacatl-codegen.c - Ahuacatl/ahuacatl-collections.c - Ahuacatl/ahuacatl-context.c - Ahuacatl/ahuacatl-conversions.c - Ahuacatl/ahuacatl-error.c - Ahuacatl/ahuacatl-explain.c - Ahuacatl/ahuacatl-functions.c - Ahuacatl/ahuacatl-grammar.c - Ahuacatl/ahuacatl-index.c - Ahuacatl/ahuacatl-node.c - Ahuacatl/ahuacatl-optimiser.c - Ahuacatl/ahuacatl-parser-functions.c - Ahuacatl/ahuacatl-parser.c - Ahuacatl/ahuacatl-result.c - Ahuacatl/ahuacatl-scope.c - Ahuacatl/ahuacatl-statement-dump.c - Ahuacatl/ahuacatl-statement-walker.c - Ahuacatl/ahuacatl-statementlist.c - Ahuacatl/ahuacatl-tokens.c - Ahuacatl/ahuacatl-variable.c + Ahuacatl/ahuacatl-access-optimiser.cpp + Ahuacatl/ahuacatl-ast-node.cpp + Ahuacatl/ahuacatl-bind-parameter.cpp + Ahuacatl/ahuacatl-codegen.cpp + Ahuacatl/ahuacatl-collections.cpp + Ahuacatl/ahuacatl-context.cpp + Ahuacatl/ahuacatl-conversions.cpp + Ahuacatl/ahuacatl-error.cpp + Ahuacatl/ahuacatl-explain.cpp + Ahuacatl/ahuacatl-functions.cpp + Ahuacatl/ahuacatl-grammar.cpp + Ahuacatl/ahuacatl-index.cpp + Ahuacatl/ahuacatl-node.cpp + Ahuacatl/ahuacatl-optimiser.cpp + Ahuacatl/ahuacatl-parser-functions.cpp + Ahuacatl/ahuacatl-parser.cpp + Ahuacatl/ahuacatl-result.cpp + Ahuacatl/ahuacatl-scope.cpp + Ahuacatl/ahuacatl-statement-dump.cpp + Ahuacatl/ahuacatl-statement-walker.cpp + Ahuacatl/ahuacatl-statementlist.cpp + Ahuacatl/ahuacatl-tokens.cpp + Ahuacatl/ahuacatl-variable.cpp BitIndexes/bitarray.cpp BitIndexes/bitarrayIndex.cpp CapConstraint/cap-constraint.cpp diff --git a/arangod/CapConstraint/cap-constraint.h b/arangod/CapConstraint/cap-constraint.h index 15a59d774d..2f8947898a 100644 --- a/arangod/CapConstraint/cap-constraint.h +++ b/arangod/CapConstraint/cap-constraint.h @@ -28,14 +28,10 @@ #ifndef TRIAGENS_CAP_CONSTRAINT_CAP_CONSTRAINT_H #define TRIAGENS_CAP_CONSTRAINT_CAP_CONSTRAINT_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "VocBase/index.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- CAP CONSTRAINT // ----------------------------------------------------------------------------- @@ -99,10 +95,6 @@ void TRI_FreeCapConstraint (TRI_index_t*); /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // ----------------------------------------------------------------------------- diff --git a/arangod/Cluster/ApplicationCluster.h b/arangod/Cluster/ApplicationCluster.h index 8b36302708..58f9de88c4 100644 --- a/arangod/Cluster/ApplicationCluster.h +++ b/arangod/Cluster/ApplicationCluster.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_CLUSTER_APPLICATION_CLUSTER_H #define TRIAGENS_CLUSTER_APPLICATION_CLUSTER_H 1 +#include "Basics/Common.h" + #include "ApplicationServer/ApplicationFeature.h" #include "Cluster/ServerState.h" diff --git a/arangod/Cluster/ClusterComm.h b/arangod/Cluster/ClusterComm.h index 5af3171377..6aba0a732f 100644 --- a/arangod/Cluster/ClusterComm.h +++ b/arangod/Cluster/ClusterComm.h @@ -28,7 +28,6 @@ #ifndef TRIAGENS_CLUSTER_COMM_H #define TRIAGENS_CLUSTER_COMM_H 1 -#include "BasicsC/common.h" #include "Basics/Common.h" #include "Basics/ReadWriteLock.h" #include "Basics/ConditionVariable.h" @@ -38,7 +37,6 @@ #include "SimpleHttpClient/SimpleHttpResult.h" #include "SimpleHttpClient/SimpleHttpClient.h" #include "VocBase/voc-types.h" - #include "Cluster/AgencyComm.h" #include "Cluster/ClusterInfo.h" #include "Cluster/ServerState.h" diff --git a/arangod/Cluster/ClusterMethods.h b/arangod/Cluster/ClusterMethods.h index 890e452463..b7b9bf4d47 100644 --- a/arangod/Cluster/ClusterMethods.h +++ b/arangod/Cluster/ClusterMethods.h @@ -28,7 +28,6 @@ #ifndef TRIAGENS_CLUSTER_METHODS_H #define TRIAGENS_CLUSTER_METHODS_H 1 -#include "BasicsC/common.h" #include "Basics/Common.h" #include "Rest/HttpRequest.h" @@ -39,7 +38,6 @@ #include "VocBase/primary-collection.h" #include "VocBase/update-policy.h" #include "VocBase/voc-types.h" - #include "Cluster/AgencyComm.h" #include "Cluster/ClusterInfo.h" #include "Cluster/ServerState.h" diff --git a/arangod/Cluster/RestShardHandler.h b/arangod/Cluster/RestShardHandler.h index 8360f6205c..9bd9ce4e27 100644 --- a/arangod/Cluster/RestShardHandler.h +++ b/arangod/Cluster/RestShardHandler.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_CLUSTER_REST_SHARD_HANDLER_H #define TRIAGENS_CLUSTER_REST_SHARD_HANDLER_H 1 +#include "Basics/Common.h" + #include "Admin/RestBaseHandler.h" namespace triagens { diff --git a/arangod/Cluster/ServerJob.h b/arangod/Cluster/ServerJob.h index 49b93a1153..2b1fd60347 100644 --- a/arangod/Cluster/ServerJob.h +++ b/arangod/Cluster/ServerJob.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_CLUSTER_SERVER_JOB_H #define TRIAGENS_CLUSTER_SERVER_JOB_H 1 +#include "Basics/Common.h" + #include "Dispatcher/Job.h" #include "Basics/Exceptions.h" diff --git a/arangod/FulltextIndex/fulltext-query.h b/arangod/FulltextIndex/fulltext-query.h index c61bf49848..0e3e8da203 100644 --- a/arangod/FulltextIndex/fulltext-query.h +++ b/arangod/FulltextIndex/fulltext-query.h @@ -28,11 +28,7 @@ #ifndef TRIAGENS_FULLTEXT_INDEX_FULLTEXT_QUERY_H #define TRIAGENS_FULLTEXT_INDEX_FULLTEXT_QUERY_H 1 -#include "BasicsC/common.h" - -#ifdef __cplusplus -extern "C" { -#endif +#include "Basics/Common.h" // ----------------------------------------------------------------------------- // --SECTION-- private defines @@ -159,10 +155,6 @@ bool TRI_SetQueryFulltextIndex (TRI_fulltext_query_t* const, /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/FulltextIndex/fulltext-wordlist.h b/arangod/FulltextIndex/fulltext-wordlist.h index 8c42380316..6d48c76754 100644 --- a/arangod/FulltextIndex/fulltext-wordlist.h +++ b/arangod/FulltextIndex/fulltext-wordlist.h @@ -28,11 +28,7 @@ #ifndef TRIAGENS_FULLTEXT_INDEX_FULLTEXT_WORDLIST_H #define TRIAGENS_FULLTEXT_INDEX_FULLTEXT_WORDLIST_H 1 -#include "BasicsC/common.h" - -#ifdef __cplusplus -extern "C" { -#endif +#include "Basics/Common.h" // ----------------------------------------------------------------------------- // --SECTION-- public types @@ -110,10 +106,6 @@ void TRI_SortWordlistFulltextIndex (TRI_fulltext_wordlist_t* const); /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/GeoIndex/GeoIndex.h b/arangod/GeoIndex/GeoIndex.h index 10d2f2cc1b..8429e8e4aa 100644 --- a/arangod/GeoIndex/GeoIndex.h +++ b/arangod/GeoIndex/GeoIndex.h @@ -28,14 +28,13 @@ /* GeoIndex.h - header file for GeoIndex algorithms */ /* Version 2.1 8.1.2012 R. A. Parker */ -#include "BasicsC/common.h" +#ifndef TRIAGENS_GEO_INDEX_GEOINDEX_H +#define TRIAGENS_GEO_INDEX_GEOINDEX_H 1 + +#include "Basics/Common.h" #include "IndexIterators/index-iterator.h" #include "IndexOperators/index-operator.h" -#ifdef __cplusplus -extern "C" { -#endif - /* first the things that a user might want to change */ /* a GeoString - a signed type of at least 64 bits */ @@ -121,8 +120,6 @@ void GeoIndex_INDEXDUMP(GeoIndex * gi, FILE * f); int GeoIndex_INDEXVALID(GeoIndex * gi); #endif -#ifdef __cplusplus -} #endif /* end of GeoIndex.h */ diff --git a/arangod/GeoIndex/geo-index.h b/arangod/GeoIndex/geo-index.h index 245b0fa491..678980e464 100644 --- a/arangod/GeoIndex/geo-index.h +++ b/arangod/GeoIndex/geo-index.h @@ -28,14 +28,10 @@ #ifndef TRIAGENS_GEO_INDEX_GEO_INDEX_H #define TRIAGENS_GEO_INDEX_GEO_INDEX_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "VocBase/index.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- GEO INDEX // ----------------------------------------------------------------------------- @@ -121,10 +117,6 @@ GeoCoordinates* TRI_NearestGeoIndex (TRI_index_t* idx, /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // ----------------------------------------------------------------------------- diff --git a/arangod/HashIndex/hash-array.h b/arangod/HashIndex/hash-array.h index 182ae61d9e..43b1936256 100644 --- a/arangod/HashIndex/hash-array.h +++ b/arangod/HashIndex/hash-array.h @@ -29,13 +29,9 @@ #ifndef TRIAGENS_HASH_INDEX_HASH_ARRAY_H #define TRIAGENS_HASH_INDEX_HASH_ARRAY_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/vector.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- forward declarations // ----------------------------------------------------------------------------- @@ -254,10 +250,6 @@ int TRI_RemoveKeyHashArrayMulti (TRI_hash_array_t*, /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // ----------------------------------------------------------------------------- diff --git a/arangod/HashIndex/hash-index.h b/arangod/HashIndex/hash-index.h index e5bae70c35..af877e726c 100644 --- a/arangod/HashIndex/hash-index.h +++ b/arangod/HashIndex/hash-index.h @@ -29,15 +29,11 @@ #ifndef TRIAGENS_HASH_INDEX_HASH_INDEX_H #define TRIAGENS_HASH_INDEX_HASH_INDEX_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "HashIndex/hash-array.h" #include "VocBase/index.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- forward declarations // ----------------------------------------------------------------------------- @@ -143,10 +139,6 @@ TRI_index_result_t TRI_LookupHashIndex (TRI_index_t*, /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // ----------------------------------------------------------------------------- diff --git a/arangod/IndexIterators/index-iterator.h b/arangod/IndexIterators/index-iterator.h index 90517a3c73..b291a10d89 100644 --- a/arangod/IndexIterators/index-iterator.h +++ b/arangod/IndexIterators/index-iterator.h @@ -28,14 +28,10 @@ #ifndef TRIAGENS_INDEX_ITERATORS_INDEX_ITERATOR_H #define TRIAGENS_INDEX_ITERATORS_INDEX_ITERATOR_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "IndexOperators/index-operator.h" #include "ShapedJson/shaped-json.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- public types // ----------------------------------------------------------------------------- @@ -174,18 +170,10 @@ void TRI_DestroyIndexIterator (TRI_index_iterator_t*); void TRI_FreeIndexIterator (TRI_index_iterator_t*); - - - //////////////////////////////////////////////////////////////////////////////// /// @} //////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/IndexOperators/index-operator.h b/arangod/IndexOperators/index-operator.h index 97f5ac7dbc..1e74940a8d 100644 --- a/arangod/IndexOperators/index-operator.h +++ b/arangod/IndexOperators/index-operator.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_INDEX_OPERATORS_INDEX_OPERATOR_H #define TRIAGENS_INDEX_OPERATORS_INDEX_OPERATOR_H 1 +#include "Basics/Common.h" + #include "BasicsC/json.h" #include "ShapedJson/json-shaper.h" #include "ShapedJson/shaped-json.h" diff --git a/arangod/MRServer/ApplicationMR.h b/arangod/MRServer/ApplicationMR.h index 745bbb782b..ef5f871078 100644 --- a/arangod/MRServer/ApplicationMR.h +++ b/arangod/MRServer/ApplicationMR.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_MRSERVER_APPLICATION_MR_H #define TRIAGENS_MRSERVER_APPLICATION_MR_H 1 +#include "Basics/Common.h" + #include "ApplicationServer/ApplicationFeature.h" #include "MRuby/mr-utils.h" diff --git a/arangod/MRServer/mr-actions.h b/arangod/MRServer/mr-actions.h index 9ed25a289b..3fee32dff1 100644 --- a/arangod/MRServer/mr-actions.h +++ b/arangod/MRServer/mr-actions.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_MRSERVER_MR_ACTIONS_H #define TRIAGENS_MRSERVER_MR_ACTIONS_H 1 +#include "Basics/Common.h" + #include "MRuby/mr-utils.h" // ----------------------------------------------------------------------------- diff --git a/arangod/Replication/replication-static.cpp b/arangod/Replication/replication-static.cpp index 923550af09..2df7f79094 100644 --- a/arangod/Replication/replication-static.cpp +++ b/arangod/Replication/replication-static.cpp @@ -33,10 +33,6 @@ using namespace std; using namespace triagens::arango; -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- public functions // ----------------------------------------------------------------------------- @@ -87,10 +83,6 @@ int TRI_RunContinuousSyncerReplication (void* ptr) { /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - // Local Variables: // mode: outline-minor // outline-regexp: "/// @brief\\|/// {@inheritDoc}\\|/// @addtogroup\\|/// @page\\|// --SECTION--\\|/// @\\}" diff --git a/arangod/Replication/replication-static.h b/arangod/Replication/replication-static.h index b2a77cbc5c..ea81c3dd8f 100644 --- a/arangod/Replication/replication-static.h +++ b/arangod/Replication/replication-static.h @@ -28,14 +28,10 @@ #ifndef TRIAGENS_REPLICATION_REPLICATION_STATIC_H #define TRIAGENS_REPLICATION_REPLICATION_STATIC_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "VocBase/voc-types.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- forward declarations // ----------------------------------------------------------------------------- @@ -77,10 +73,6 @@ int TRI_RunContinuousSyncerReplication (void*); /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/RestHandler/RestBatchHandler.h b/arangod/RestHandler/RestBatchHandler.h index f7f49a63d7..c81942e558 100644 --- a/arangod/RestHandler/RestBatchHandler.h +++ b/arangod/RestHandler/RestBatchHandler.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_REST_HANDLER_REST_BATCH_HANDLER_H #define TRIAGENS_REST_HANDLER_REST_BATCH_HANDLER_H 1 +#include "Basics/Common.h" + #include "RestHandler/RestVocbaseBaseHandler.h" using namespace triagens::basics; diff --git a/arangod/RestHandler/RestDocumentHandler.h b/arangod/RestHandler/RestDocumentHandler.h index 22ef6c3ab6..800195134c 100644 --- a/arangod/RestHandler/RestDocumentHandler.h +++ b/arangod/RestHandler/RestDocumentHandler.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_REST_HANDLER_REST_DOCUMENT_HANDLER_H #define TRIAGENS_REST_HANDLER_REST_DOCUMENT_HANDLER_H 1 +#include "Basics/Common.h" + #include "RestHandler/RestVocbaseBaseHandler.h" // ----------------------------------------------------------------------------- diff --git a/arangod/RestHandler/RestEdgeHandler.h b/arangod/RestHandler/RestEdgeHandler.h index 3b18aed259..66f171d89f 100644 --- a/arangod/RestHandler/RestEdgeHandler.h +++ b/arangod/RestHandler/RestEdgeHandler.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_REST_HANDLER_REST_EDGE_HANDLER_H #define TRIAGENS_REST_HANDLER_REST_EDGE_HANDLER_H 1 +#include "Basics/Common.h" + #include "RestHandler/RestDocumentHandler.h" // ----------------------------------------------------------------------------- diff --git a/arangod/RestHandler/RestImportHandler.h b/arangod/RestHandler/RestImportHandler.h index 13ba86735a..263fa9a281 100644 --- a/arangod/RestHandler/RestImportHandler.h +++ b/arangod/RestHandler/RestImportHandler.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_REST_HANDLER_REST_IMPORT_HANDLER_H #define TRIAGENS_REST_HANDLER_REST_IMPORT_HANDLER_H 1 +#include "Basics/Common.h" + #include "RestHandler/RestVocbaseBaseHandler.h" // ----------------------------------------------------------------------------- diff --git a/arangod/RestHandler/RestPleaseUpgradeHandler.h b/arangod/RestHandler/RestPleaseUpgradeHandler.h index ba30c99426..88437fc8c9 100644 --- a/arangod/RestHandler/RestPleaseUpgradeHandler.h +++ b/arangod/RestHandler/RestPleaseUpgradeHandler.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_REST_HANDLER_REST_PLEASE_UPGRADE_HANDLER_H #define TRIAGENS_REST_HANDLER_REST_PLEASE_UPGRADE_HANDLER_H 1 +#include "Basics/Common.h" + #include "HttpServer/HttpHandler.h" // ----------------------------------------------------------------------------- diff --git a/arangod/RestHandler/RestUploadHandler.h b/arangod/RestHandler/RestUploadHandler.h index 2eab4e00ef..c549925a37 100644 --- a/arangod/RestHandler/RestUploadHandler.h +++ b/arangod/RestHandler/RestUploadHandler.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_REST_HANDLER_REST_UPLOAD_HANDLER_H #define TRIAGENS_REST_HANDLER_REST_UPLOAD_HANDLER_H 1 +#include "Basics/Common.h" + #include "RestHandler/RestVocbaseBaseHandler.h" #include "HttpServer/HttpServer.h" diff --git a/arangod/RestHandler/RestVocbaseBaseHandler.h b/arangod/RestHandler/RestVocbaseBaseHandler.h index 1924bd527f..113ea41960 100644 --- a/arangod/RestHandler/RestVocbaseBaseHandler.h +++ b/arangod/RestHandler/RestVocbaseBaseHandler.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_REST_HANDLER_REST_VOCBASE_BASE_HANDLER_H #define TRIAGENS_REST_HANDLER_REST_VOCBASE_BASE_HANDLER_H 1 +#include "Basics/Common.h" + #include "Admin/RestBaseHandler.h" #include "BasicsC/json.h" diff --git a/arangod/RestServer/ArangoServer.cpp b/arangod/RestServer/ArangoServer.cpp index 9faadab39f..53db506e08 100644 --- a/arangod/RestServer/ArangoServer.cpp +++ b/arangod/RestServer/ArangoServer.cpp @@ -49,7 +49,7 @@ #include "Basics/RandomGenerator.h" #include "Basics/Utf8Helper.h" #include "BasicsC/files.h" -#include "BasicsC/init.h" +#include "Basics/init.h" #include "BasicsC/logging.h" #include "BasicsC/messages.h" #include "BasicsC/tri-strings.h" diff --git a/arangod/SkipLists/skiplistIndex.h b/arangod/SkipLists/skiplistIndex.h index 25733cab27..04a44c21f2 100644 --- a/arangod/SkipLists/skiplistIndex.h +++ b/arangod/SkipLists/skiplistIndex.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_SKIP_LISTS_SKIPLIST_INDEX_H #define TRIAGENS_SKIP_LISTS_SKIPLIST_INDEX_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/skip-list.h" @@ -36,10 +36,6 @@ #include "IndexOperators/index-operator.h" #include "ShapedJson/shaped-json.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- forward declarations // ----------------------------------------------------------------------------- @@ -164,10 +160,6 @@ uint64_t SkiplistIndex_getNrUsed (SkiplistIndex*); size_t SkiplistIndex_memoryUsage (SkiplistIndex const*); -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/Utils/AhuacatlGuard.h b/arangod/Utils/AhuacatlGuard.h index d3c3993626..b25c9cd564 100644 --- a/arangod/Utils/AhuacatlGuard.h +++ b/arangod/Utils/AhuacatlGuard.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_UTILS_AHUACATL_GUARD_H #define TRIAGENS_UTILS_AHUACATL_GUARD_H 1 +#include "Basics/Common.h" + #include "Ahuacatl/ahuacatl-context.h" #include "BasicsC/json.h" #include "BasicsC/logging.h" diff --git a/arangod/Utils/AhuacatlTransaction.h b/arangod/Utils/AhuacatlTransaction.h index 700db16b74..b5cd350ca2 100644 --- a/arangod/Utils/AhuacatlTransaction.h +++ b/arangod/Utils/AhuacatlTransaction.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_UTILS_AHUACATL_TRANSACTION_H #define TRIAGENS_UTILS_AHUACATL_TRANSACTION_H 1 +#include "Basics/Common.h" + #include "Cluster/ServerState.h" #include "Utils/CollectionNameResolver.h" diff --git a/arangod/Utils/Barrier.h b/arangod/Utils/Barrier.h index 3e2a5c917e..e7d143e8e7 100644 --- a/arangod/Utils/Barrier.h +++ b/arangod/Utils/Barrier.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_UTILS_BARRIER_H #define TRIAGENS_UTILS_BARRIER_H 1 +#include "Basics/Common.h" + #include "VocBase/barrier.h" #include "VocBase/primary-collection.h" diff --git a/arangod/Utils/EmbeddableTransaction.h b/arangod/Utils/EmbeddableTransaction.h index fdff16ae84..656321b44f 100644 --- a/arangod/Utils/EmbeddableTransaction.h +++ b/arangod/Utils/EmbeddableTransaction.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_UTILS_EMBEDDABLE_TRANSACTION_H #define TRIAGENS_UTILS_EMBEDDABLE_TRANSACTION_H 1 +#include "Basics/Common.h" + namespace triagens { namespace arango { diff --git a/arangod/Utils/ExplicitTransaction.h b/arangod/Utils/ExplicitTransaction.h index 65cd6b9b97..a11a221eb7 100644 --- a/arangod/Utils/ExplicitTransaction.h +++ b/arangod/Utils/ExplicitTransaction.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_UTILS_USER_TRANSACTION_H #define TRIAGENS_UTILS_USER_TRANSACTION_H 1 +#include "Basics/Common.h" + #include "Utils/Transaction.h" #include "VocBase/server.h" #include "VocBase/transaction.h" diff --git a/arangod/Utils/RestTransactionContext.h b/arangod/Utils/RestTransactionContext.h index 76b1538683..8ee51d5f75 100644 --- a/arangod/Utils/RestTransactionContext.h +++ b/arangod/Utils/RestTransactionContext.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_UTILS_REST_TRANSACTION_CONTEXT_H #define TRIAGENS_UTILS_REST_TRANSACTION_CONTEXT_H 1 +#include "Basics/Common.h" + #include "VocBase/transaction.h" namespace triagens { diff --git a/arangod/Utils/SingleCollectionReadOnlyTransaction.h b/arangod/Utils/SingleCollectionReadOnlyTransaction.h index 53f6683b9d..0e1e8a15be 100644 --- a/arangod/Utils/SingleCollectionReadOnlyTransaction.h +++ b/arangod/Utils/SingleCollectionReadOnlyTransaction.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_UTILS_SINGLE_COLLECTION_READ_ONLY_TRANSACTION_H #define TRIAGENS_UTILS_SINGLE_COLLECTION_READ_ONLY_TRANSACTION_H 1 +#include "Basics/Common.h" + #include "Utils/CollectionNameResolver.h" #include "Utils/SingleCollectionTransaction.h" diff --git a/arangod/Utils/SingleCollectionTransaction.h b/arangod/Utils/SingleCollectionTransaction.h index 0245fbe5f6..0f78aa9dd0 100644 --- a/arangod/Utils/SingleCollectionTransaction.h +++ b/arangod/Utils/SingleCollectionTransaction.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_UTILS_SINGLE_COLLECTION_TRANSACTION_H #define TRIAGENS_UTILS_SINGLE_COLLECTION_TRANSACTION_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/logging.h" #include "BasicsC/voc-errors.h" diff --git a/arangod/Utils/SingleCollectionWriteTransaction.h b/arangod/Utils/SingleCollectionWriteTransaction.h index cee8472572..ce9a9b282e 100644 --- a/arangod/Utils/SingleCollectionWriteTransaction.h +++ b/arangod/Utils/SingleCollectionWriteTransaction.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_UTILS_SINGLE_COLLECTION_WRITE_TRANSACTION_H #define TRIAGENS_UTILS_SINGLE_COLLECTION_WRITE_TRANSACTION_H 1 +#include "Basics/Common.h" + #include "Utils/CollectionNameResolver.h" #include "Utils/SingleCollectionTransaction.h" diff --git a/arangod/Utils/StandaloneTransaction.h b/arangod/Utils/StandaloneTransaction.h index b6d5bdd1fb..153f9b586b 100644 --- a/arangod/Utils/StandaloneTransaction.h +++ b/arangod/Utils/StandaloneTransaction.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_UTILS_STANDALONE_TRANSACTION_H #define TRIAGENS_UTILS_STANDALONE_TRANSACTION_H 1 +#include "Basics/Common.h" + namespace triagens { namespace arango { diff --git a/arangod/Utils/Transaction.h b/arangod/Utils/Transaction.h index 319267ff18..dd45990a25 100644 --- a/arangod/Utils/Transaction.h +++ b/arangod/Utils/Transaction.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_UTILS_TRANSACTION_H #define TRIAGENS_UTILS_TRANSACTION_H 1 +#include "Basics/Common.h" + #include "Cluster/ServerState.h" #include "VocBase/barrier.h" diff --git a/arangod/Utils/V8TransactionContext.h b/arangod/Utils/V8TransactionContext.h index 3f4ce96d7a..47875c760d 100644 --- a/arangod/Utils/V8TransactionContext.h +++ b/arangod/Utils/V8TransactionContext.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_UTILS_V8TRANSACTION_CONTEXT_H #define TRIAGENS_UTILS_V8TRANSACTION_CONTEXT_H 1 +#include "Basics/Common.h" + #include #include "V8/v8-globals.h" diff --git a/arangod/V8Server/ApplicationV8.h b/arangod/V8Server/ApplicationV8.h index 3c18536e38..ef054919a6 100644 --- a/arangod/V8Server/ApplicationV8.h +++ b/arangod/V8Server/ApplicationV8.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_V8SERVER_APPLICATION_V8_H #define TRIAGENS_V8SERVER_APPLICATION_V8_H 1 +#include "Basics/Common.h" + #include "ApplicationServer/ApplicationFeature.h" #include diff --git a/arangod/V8Server/V8Job.h b/arangod/V8Server/V8Job.h index 2e3a89901f..5144bfd27d 100644 --- a/arangod/V8Server/V8Job.h +++ b/arangod/V8Server/V8Job.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_V8SERVER_V8_JOB_H #define TRIAGENS_V8SERVER_V8_JOB_H 1 +#include "Basics/Common.h" + #include "Dispatcher/Job.h" #include "BasicsC/json.h" diff --git a/arangod/V8Server/V8PeriodicTask.h b/arangod/V8Server/V8PeriodicTask.h index d53197db1e..e555e6a82c 100644 --- a/arangod/V8Server/V8PeriodicTask.h +++ b/arangod/V8Server/V8PeriodicTask.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_V8SERVER_V8PERIODIC_TASK_H #define TRIAGENS_V8SERVER_V8PERIODIC_TASK_H 1 +#include "Basics/Common.h" + #include "Scheduler/PeriodicTask.h" #include "VocBase/vocbase.h" diff --git a/arangod/V8Server/V8TimerTask.h b/arangod/V8Server/V8TimerTask.h index 48e652508c..a8d639a877 100644 --- a/arangod/V8Server/V8TimerTask.h +++ b/arangod/V8Server/V8TimerTask.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_V8SERVER_V8TIMER_TASK_H #define TRIAGENS_V8SERVER_V8TIMER_TASK_H 1 +#include "Basics/Common.h" + #include "Scheduler/TimerTask.h" #include "VocBase/vocbase.h" diff --git a/arangod/V8Server/v8-actions.h b/arangod/V8Server/v8-actions.h index 2c18bb28a2..e9d7e7c484 100644 --- a/arangod/V8Server/v8-actions.h +++ b/arangod/V8Server/v8-actions.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_V8SERVER_V8_ACTIONS_H #define TRIAGENS_V8SERVER_V8_ACTIONS_H 1 +#include "Basics/Common.h" + #include "V8/v8-globals.h" #include "VocBase/vocbase.h" diff --git a/arangod/V8Server/v8-query.h b/arangod/V8Server/v8-query.h index c326ba54c8..0cc6283f07 100644 --- a/arangod/V8Server/v8-query.h +++ b/arangod/V8Server/v8-query.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_V8SERVER_V8_QUERY_H #define TRIAGENS_V8SERVER_V8_QUERY_H 1 +#include "Basics/Common.h" + #include "V8/v8-globals.h" #include "VocBase/vocbase.h" diff --git a/arangod/VocBase/auth.h b/arangod/VocBase/auth.h index 8c35dc91c7..12dbecec3a 100644 --- a/arangod/VocBase/auth.h +++ b/arangod/VocBase/auth.h @@ -28,11 +28,7 @@ #ifndef TRIAGENS_VOC_BASE_AUTH_H #define TRIAGENS_VOC_BASE_AUTH_H 1 -#include "BasicsC/common.h" - -#ifdef __cplusplus -extern "C" { -#endif +#include "Basics/Common.h" // ----------------------------------------------------------------------------- // --SECTION-- forward declarations @@ -134,10 +130,6 @@ bool TRI_CheckAuthenticationAuthInfo (struct TRI_vocbase_s*, char const* password, bool* mustChange); -#ifdef __cplusplus -} -#endif - // ----------------------------------------------------------------------------- // --SECTION-- END-OF-FILE // ----------------------------------------------------------------------------- diff --git a/arangod/VocBase/barrier.h b/arangod/VocBase/barrier.h index bf8c65dfc9..87a0d8b78e 100644 --- a/arangod/VocBase/barrier.h +++ b/arangod/VocBase/barrier.h @@ -28,11 +28,9 @@ #ifndef TRIAGENS_VOC_BASE_BARRIER_H #define TRIAGENS_VOC_BASE_BARRIER_H 1 -#include "BasicsC/locks.h" +#include "Basics/Common.h" -#ifdef __cplusplus -extern "C" { -#endif +#include "BasicsC/locks.h" // ----------------------------------------------------------------------------- // --SECTION-- forward declarations @@ -267,10 +265,6 @@ void TRI_FreeBarrier (TRI_barrier_t* element); /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/VocBase/cleanup.h b/arangod/VocBase/cleanup.h index fae2bf40b4..ef27edeff8 100644 --- a/arangod/VocBase/cleanup.h +++ b/arangod/VocBase/cleanup.h @@ -28,14 +28,10 @@ #ifndef TRIAGENS_VOC_BASE_CLEANUP_H #define TRIAGENS_VOC_BASE_CLEANUP_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "VocBase/vocbase.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- defines // ----------------------------------------------------------------------------- @@ -74,10 +70,6 @@ void TRI_CleanupVocBase (void*); /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/VocBase/collection.h b/arangod/VocBase/collection.h index 5348d1a51e..1725b0f8cf 100644 --- a/arangod/VocBase/collection.h +++ b/arangod/VocBase/collection.h @@ -28,17 +28,13 @@ #ifndef TRIAGENS_VOC_BASE_COLLECTION_H #define TRIAGENS_VOC_BASE_COLLECTION_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/vector.h" #include "VocBase/datafile.h" #include "VocBase/vocbase.h" -#ifdef __cplusplus -extern "C" { -#endif - //////////////////////////////////////////////////////////////////////////////// /// @page DurhamCollections Collections /// @@ -465,10 +461,6 @@ bool TRI_IsAllowedNameCollection (bool, char const* TRI_TypeNameCollection (const TRI_col_type_e); -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/VocBase/compactor.h b/arangod/VocBase/compactor.h index 0d70ccc44c..485f7d1061 100644 --- a/arangod/VocBase/compactor.h +++ b/arangod/VocBase/compactor.h @@ -28,14 +28,10 @@ #ifndef TRIAGENS_VOC_BASE_COMPACTOR_H #define TRIAGENS_VOC_BASE_COMPACTOR_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "VocBase/voc-types.h" -#ifdef __cplusplus -extern "C" { -#endif - struct TRI_vocbase_s; // ----------------------------------------------------------------------------- @@ -112,10 +108,6 @@ void TRI_CompactorVocBase (void*); /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/VocBase/datafile.h b/arangod/VocBase/datafile.h index 10bb079c1c..958a853d5f 100644 --- a/arangod/VocBase/datafile.h +++ b/arangod/VocBase/datafile.h @@ -28,16 +28,12 @@ #ifndef TRIAGENS_VOC_BASE_DATAFILE_H #define TRIAGENS_VOC_BASE_DATAFILE_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/locks.h" #include "VocBase/vocbase.h" -#ifdef __cplusplus -extern "C" { -#endif - //////////////////////////////////////////////////////////////////////////////// /// @page DurhamDatafiles Datafiles /// @@ -637,10 +633,6 @@ void TRI_DestroyDatafileScan (TRI_df_scan_t* scan); /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/VocBase/document-collection.h b/arangod/VocBase/document-collection.h index 4386bdac59..ad207db4e8 100644 --- a/arangod/VocBase/document-collection.h +++ b/arangod/VocBase/document-collection.h @@ -29,6 +29,8 @@ #ifndef TRIAGENS_VOC_BASE_DOCUMENT_COLLECTION_H #define TRIAGENS_VOC_BASE_DOCUMENT_COLLECTION_H 1 +#include "Basics/Common.h" + #include "VocBase/primary-collection.h" #include "VocBase/headers.h" @@ -37,10 +39,6 @@ #include -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- forward declarations // ----------------------------------------------------------------------------- @@ -685,10 +683,6 @@ int TRI_RotateJournalDocumentCollection (TRI_document_collection_t*); /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/VocBase/general-cursor.h b/arangod/VocBase/general-cursor.h index b428f0f6da..502b70ee6e 100644 --- a/arangod/VocBase/general-cursor.h +++ b/arangod/VocBase/general-cursor.h @@ -28,14 +28,12 @@ #ifndef TRIAGENS_VOC_BASE_GENERAL_CURSOR_H #define TRIAGENS_VOC_BASE_GENERAL_CURSOR_H 1 +#include "Basics/Common.h" + #include "BasicsC/associative.h" #include "VocBase/server.h" #include "VocBase/vocbase.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- forward declarations // ----------------------------------------------------------------------------- @@ -300,10 +298,6 @@ void TRI_CleanupGeneralCursor (TRI_general_cursor_store_t*, /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/VocBase/headers.h b/arangod/VocBase/headers.h index 1caca9fae5..b17721c87e 100644 --- a/arangod/VocBase/headers.h +++ b/arangod/VocBase/headers.h @@ -28,11 +28,7 @@ #ifndef TRIAGENS_VOC_BASE_HEADERS_H #define TRIAGENS_VOC_BASE_HEADERS_H 1 -#include "BasicsC/common.h" - -#ifdef __cplusplus -extern "C" { -#endif +#include "Basics/Common.h" // ----------------------------------------------------------------------------- // --SECTION-- forward declarations @@ -116,10 +112,6 @@ void TRI_FreeSimpleHeaders (TRI_headers_t*); /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/VocBase/index.h b/arangod/VocBase/index.h index fb1d93c7c6..cfb9f8f23f 100644 --- a/arangod/VocBase/index.h +++ b/arangod/VocBase/index.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_VOC_BASE_INDEX_H #define TRIAGENS_VOC_BASE_INDEX_H 1 +#include "Basics/Common.h" + #include "VocBase/vocbase.h" #include "BasicsC/associative-multi.h" @@ -42,10 +44,6 @@ #include "SkipLists/skiplistIndex.h" #include "VocBase/voc-types.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- forward declarations // ----------------------------------------------------------------------------- @@ -611,10 +609,6 @@ bool IndexComparator (TRI_json_t const* lhs, TRI_json_t const* rhs); /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/VocBase/key-generator.h b/arangod/VocBase/key-generator.h index 94c9d235ba..7539df70c9 100644 --- a/arangod/VocBase/key-generator.h +++ b/arangod/VocBase/key-generator.h @@ -28,15 +28,10 @@ #ifndef TRIAGENS_VOC_BASE_KEY_GENERATOR_H #define TRIAGENS_VOC_BASE_KEY_GENERATOR_H 1 -#include "BasicsC/common.h" #include "Basics/Common.h" #include "VocBase/vocbase.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- KEY GENERATORS // ----------------------------------------------------------------------------- @@ -131,10 +126,6 @@ bool TRI_ValidateDocumentIdKeyGenerator (char const*, /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/VocBase/marker.h b/arangod/VocBase/marker.h index 82bd58c3c8..e0ce4233a4 100644 --- a/arangod/VocBase/marker.h +++ b/arangod/VocBase/marker.h @@ -28,14 +28,10 @@ #ifndef TRIAGENS_VOC_BASE_MARKER_H #define TRIAGENS_VOC_BASE_MARKER_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "VocBase/datafile.h" #include "VocBase/voc-types.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- public functions // ----------------------------------------------------------------------------- @@ -72,10 +68,6 @@ void TRI_InitMarker (char*, /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/VocBase/primary-collection.h b/arangod/VocBase/primary-collection.h index f833840967..3a48b535c0 100644 --- a/arangod/VocBase/primary-collection.h +++ b/arangod/VocBase/primary-collection.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_VOC_BASE_PRIMARY_COLLECTION_H #define TRIAGENS_VOC_BASE_PRIMARY_COLLECTION_H 1 +#include "Basics/Common.h" + #include "VocBase/collection.h" #include "BasicsC/json.h" @@ -38,10 +40,6 @@ #include "VocBase/update-policy.h" #include "VocBase/voc-types.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- forward declarations // ----------------------------------------------------------------------------- @@ -509,10 +507,6 @@ size_t TRI_DocumentIteratorPrimaryCollection (TRI_primary_collection_t*, /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/VocBase/replication-applier.h b/arangod/VocBase/replication-applier.h index 2c02adc7cc..7fd082026c 100644 --- a/arangod/VocBase/replication-applier.h +++ b/arangod/VocBase/replication-applier.h @@ -28,17 +28,13 @@ #ifndef TRIAGENS_VOC_BASE_REPLICATION_APPLIER_H #define TRIAGENS_VOC_BASE_REPLICATION_APPLIER_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/locks.h" #include "BasicsC/threads.h" #include "Replication/replication-static.h" #include "VocBase/replication-common.h" #include "VocBase/voc-types.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- forward declarations // ----------------------------------------------------------------------------- @@ -312,10 +308,6 @@ int TRI_ForgetReplicationApplier (TRI_replication_applier_t*); /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/VocBase/replication-dump.h b/arangod/VocBase/replication-dump.h index e061d26169..60ab25221f 100644 --- a/arangod/VocBase/replication-dump.h +++ b/arangod/VocBase/replication-dump.h @@ -28,17 +28,13 @@ #ifndef TRIAGENS_VOC_BASE_REPLICATION_DUMP_H #define TRIAGENS_VOC_BASE_REPLICATION_DUMP_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/associative.h" #include "ShapedJson/shaped-json.h" #include "VocBase/replication-common.h" #include "VocBase/voc-types.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- forward declarations // ----------------------------------------------------------------------------- @@ -131,10 +127,6 @@ void TRI_DestroyDumpReplication (TRI_replication_dump_t*); /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/VocBase/replication-logger.h b/arangod/VocBase/replication-logger.h index 1a08dc02f6..816354c7a9 100644 --- a/arangod/VocBase/replication-logger.h +++ b/arangod/VocBase/replication-logger.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_VOC_BASE_REPLICATION_LOGGER_H #define TRIAGENS_VOC_BASE_REPLICATION_LOGGER_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/associative.h" #include "BasicsC/locks.h" @@ -38,10 +38,6 @@ #include "VocBase/vocbase.h" #include "VocBase/voc-types.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- forward declarations // ----------------------------------------------------------------------------- @@ -322,10 +318,6 @@ int TRI_LogDocumentReplication (struct TRI_vocbase_s*, /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/VocBase/replication-master.h b/arangod/VocBase/replication-master.h index 72c759e1d7..c079751e1d 100644 --- a/arangod/VocBase/replication-master.h +++ b/arangod/VocBase/replication-master.h @@ -28,15 +28,11 @@ #ifndef TRIAGENS_VOC_BASE_REPLICATION_MASTER_H #define TRIAGENS_VOC_BASE_REPLICATION_MASTER_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "VocBase/replication-common.h" #include "VocBase/replication-logger.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- REPLICATION MASTER INFO // ----------------------------------------------------------------------------- @@ -100,10 +96,6 @@ void TRI_LogMasterInfoReplication (TRI_replication_master_info_t const*, /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/VocBase/server.h b/arangod/VocBase/server.h index 6657e8feee..5cb527b270 100644 --- a/arangod/VocBase/server.h +++ b/arangod/VocBase/server.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_VOC_BASE_SERVER_H #define TRIAGENS_VOC_BASE_SERVER_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/associative.h" #include "BasicsC/locks.h" #include "BasicsC/threads.h" @@ -36,11 +36,7 @@ #include "VocBase/voc-types.h" #include "VocBase/vocbase-defaults.h" -#ifdef __cplusplus -extern "C" { - struct TRI_vocbase_s; -#endif // ----------------------------------------------------------------------------- // --SECTION-- public types @@ -301,10 +297,6 @@ bool TRI_MSync (int, char const*, char const*); -#ifdef __cplusplus -} -#endif - // ----------------------------------------------------------------------------- // --SECTION-- END-OF-FILE // ----------------------------------------------------------------------------- diff --git a/arangod/VocBase/synchroniser.h b/arangod/VocBase/synchroniser.h index f48d77a262..02c2ba19e2 100644 --- a/arangod/VocBase/synchroniser.h +++ b/arangod/VocBase/synchroniser.h @@ -28,11 +28,7 @@ #ifndef TRIAGENS_VOC_BASE_SYNCHRONISER_H #define TRIAGENS_VOC_BASE_SYNCHRONISER_H 1 -#include "BasicsC/common.h" - -#ifdef __cplusplus -extern "C" { -#endif +#include "Basics/Common.h" // ----------------------------------------------------------------------------- // --SECTION-- public functions @@ -53,10 +49,6 @@ void TRI_SynchroniserVocBase (void*); /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/VocBase/transaction.h b/arangod/VocBase/transaction.h index ba1210fb0b..c4acc9bc03 100644 --- a/arangod/VocBase/transaction.h +++ b/arangod/VocBase/transaction.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_VOC_BASE_TRANSACTION_H #define TRIAGENS_VOC_BASE_TRANSACTION_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/associative.h" #include "BasicsC/hashes.h" @@ -38,10 +38,6 @@ #include "VocBase/datafile.h" #include "VocBase/voc-types.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- forward declarations // ----------------------------------------------------------------------------- @@ -421,11 +417,6 @@ int TRI_CreateMarkerAbortTransaction (TRI_transaction_t*, int TRI_CreateMarkerPrepareTransaction (TRI_transaction_t*, struct TRI_doc_prepare_transaction_marker_s**); - -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/VocBase/update-policy.h b/arangod/VocBase/update-policy.h index 2395158f70..e4654d1184 100644 --- a/arangod/VocBase/update-policy.h +++ b/arangod/VocBase/update-policy.h @@ -28,13 +28,9 @@ #ifndef TRIAGENS_VOC_BASE_DOCUMENT_POLICY_H #define TRIAGENS_VOC_BASE_DOCUMENT_POLICY_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "VocBase/vocbase.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- public types // ----------------------------------------------------------------------------- @@ -103,10 +99,6 @@ int TRI_CheckUpdatePolicy (const TRI_doc_update_policy_t* const, /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/VocBase/voc-shaper.h b/arangod/VocBase/voc-shaper.h index 429e46ac2f..97e5abf131 100644 --- a/arangod/VocBase/voc-shaper.h +++ b/arangod/VocBase/voc-shaper.h @@ -29,7 +29,7 @@ #ifndef TRIAGENS_VOC_BASE_VOC_SHAPER_H #define TRIAGENS_VOC_BASE_VOC_SHAPER_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "ShapedJson/json-shaper.h" #include "ShapedJson/shape-accessor.h" @@ -38,10 +38,6 @@ #include "VocBase/document-collection.h" #include "Wal/Marker.h" -#ifdef __cplusplus -extern "C" { -#endif - struct TRI_document_collection_s; // ----------------------------------------------------------------------------- @@ -193,10 +189,6 @@ static inline void TRI_EXTRACT_SHAPED_JSON_MARKER (TRI_shaped_json_t& dst, } } -#ifdef __cplusplus -} -#endif - #endif // ----------------------------------------------------------------------------- diff --git a/arangod/VocBase/voc-types.h b/arangod/VocBase/voc-types.h index ff5172e9ca..414455135f 100644 --- a/arangod/VocBase/voc-types.h +++ b/arangod/VocBase/voc-types.h @@ -28,11 +28,7 @@ #ifndef TRIAGENS_VOC_BASE_VOC_TYPES_H #define TRIAGENS_VOC_BASE_VOC_TYPES_H 1 -#include "BasicsC/common.h" - -#ifdef __cplusplus -extern "C" { -#endif +#include "Basics/Common.h" // ----------------------------------------------------------------------------- // --SECTION-- public defines @@ -149,10 +145,6 @@ TRI_voc_document_operation_e; /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - // ----------------------------------------------------------------------------- // --SECTION-- END-OF-FILE // ----------------------------------------------------------------------------- diff --git a/arangod/VocBase/vocbase-defaults.h b/arangod/VocBase/vocbase-defaults.h index f24f93ca88..dc3f6c6575 100644 --- a/arangod/VocBase/vocbase-defaults.h +++ b/arangod/VocBase/vocbase-defaults.h @@ -28,13 +28,9 @@ #ifndef TRIAGENS_VOC_BASE_VOCBASE_DEFAULTS_H #define TRIAGENS_VOC_BASE_VOCBASE_DEFAULTS_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "VocBase/voc-types.h" -#ifdef __cplusplus -extern "C" { -#endif - struct TRI_json_s; struct TRI_vocbase_s; @@ -100,10 +96,6 @@ void TRI_FromJsonVocBaseDefaults (TRI_vocbase_defaults_t*, /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - // ----------------------------------------------------------------------------- // --SECTION-- END-OF-FILE // ----------------------------------------------------------------------------- diff --git a/arangod/VocBase/vocbase.h b/arangod/VocBase/vocbase.h index cd7d5bc9b9..a2f32af41b 100644 --- a/arangod/VocBase/vocbase.h +++ b/arangod/VocBase/vocbase.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_VOC_BASE_VOCBASE_H #define TRIAGENS_VOC_BASE_VOCBASE_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/associative.h" #include "BasicsC/locks.h" @@ -37,10 +37,6 @@ #include "BasicsC/voc-errors.h" #include "VocBase/vocbase-defaults.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- forward declarations // ----------------------------------------------------------------------------- @@ -663,10 +659,6 @@ bool TRI_IsSystemVocBase (TRI_vocbase_t*); bool TRI_IsAllowedNameVocBase (bool, char const*); -#ifdef __cplusplus -} -#endif - // ----------------------------------------------------------------------------- // --SECTION-- END-OF-FILE // ----------------------------------------------------------------------------- diff --git a/arangoirb/MRClient/arangoirb.cpp b/arangoirb/MRClient/arangoirb.cpp index 9449532a12..a274af0a29 100644 --- a/arangoirb/MRClient/arangoirb.cpp +++ b/arangoirb/MRClient/arangoirb.cpp @@ -40,7 +40,7 @@ #include "Basics/StringUtils.h" #include "BasicsC/csv.h" #include "BasicsC/files.h" -#include "BasicsC/init.h" +#include "Basics/init.h" #include "BasicsC/logging.h" #include "BasicsC/shell-colors.h" #include "BasicsC/tri-strings.h" diff --git a/arangoirb/MRClient/mr-connection.c b/arangoirb/MRClient/mr-connection.c deleted file mode 100644 index af11ed267f..0000000000 --- a/arangoirb/MRClient/mr-connection.c +++ /dev/null @@ -1,54 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -/// @brief mruby http conntection -/// -/// @file -/// -/// DISCLAIMER -/// -/// Copyright 2004-2013 triAGENS GmbH, Cologne, Germany -/// -/// Licensed under the Apache License, Version 2.0 (the "License"); -/// you may not use this file except in compliance with the License. -/// You may obtain a copy of the License at -/// -/// http://www.apache.org/licenses/LICENSE-2.0 -/// -/// Unless required by applicable law or agreed to in writing, software -/// distributed under the License is distributed on an "AS IS" BASIS, -/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -/// See the License for the specific language governing permissions and -/// limitations under the License. -/// -/// Copyright holder is triAGENS GmbH, Cologne, Germany -/// -/// @author Dr. Frank Celler -/// @author Copyright 2012-2013, triAGENS GmbH, Cologne, Germany -//////////////////////////////////////////////////////////////////////////////// - -#include "mr-connection.h" - -// ----------------------------------------------------------------------------- -// --SECTION-- module functions -// ----------------------------------------------------------------------------- - -//////////////////////////////////////////////////////////////////////////////// -/// @addtogroup ArangoDB -/// @{ -//////////////////////////////////////////////////////////////////////////////// - -//////////////////////////////////////////////////////////////////////////////// -/// @brief init mruby utilities -//////////////////////////////////////////////////////////////////////////////// - -void TRI_InitMRConnection (MR_state_t* mrb) { - -} - -//////////////////////////////////////////////////////////////////////////////// -/// @} -//////////////////////////////////////////////////////////////////////////////// - -// Local Variables: -// mode: outline-minor -// outline-regexp: "/// @brief\\|/// {@inheritDoc}\\|/// @addtogroup\\|/// @page\\|// --SECTION--\\|/// @\\}" -// End: diff --git a/arangoirb/MRClient/mr-connection.h b/arangoirb/MRClient/mr-connection.h deleted file mode 100644 index e9eeff714c..0000000000 --- a/arangoirb/MRClient/mr-connection.h +++ /dev/null @@ -1,97 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -/// @brief mruby http conntection -/// -/// @file -/// -/// DISCLAIMER -/// -/// Copyright 2004-2013 triAGENS GmbH, Cologne, Germany -/// -/// Licensed under the Apache License, Version 2.0 (the "License"); -/// you may not use this file except in compliance with the License. -/// You may obtain a copy of the License at -/// -/// http://www.apache.org/licenses/LICENSE-2.0 -/// -/// Unless required by applicable law or agreed to in writing, software -/// distributed under the License is distributed on an "AS IS" BASIS, -/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -/// See the License for the specific language governing permissions and -/// limitations under the License. -/// -/// Copyright holder is triAGENS GmbH, Cologne, Germany -/// -/// @author Dr. Frank Celler -/// @author Copyright 2012-2013, triAGENS GmbH, Cologne, Germany -//////////////////////////////////////////////////////////////////////////////// - -#ifndef TRIAGENS_MRCLIENT_MR_CONNECTION_H -#define TRIAGENS_MRCLIENT_MR_CONNECTION_H 1 - -#include "BasicsC/common.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#include "mruby.h" - -// ----------------------------------------------------------------------------- -// --SECTION-- forward declarations -// ----------------------------------------------------------------------------- - -// ----------------------------------------------------------------------------- -// --SECTION-- public types -// ----------------------------------------------------------------------------- - -//////////////////////////////////////////////////////////////////////////////// -/// @addtogroup ArangoDB -/// @{ -//////////////////////////////////////////////////////////////////////////////// - -//////////////////////////////////////////////////////////////////////////////// -/// @} -//////////////////////////////////////////////////////////////////////////////// - -// ----------------------------------------------------------------------------- -// --SECTION-- public functions -// ----------------------------------------------------------------------------- - -//////////////////////////////////////////////////////////////////////////////// -/// @addtogroup ArangoDB -/// @{ -//////////////////////////////////////////////////////////////////////////////// - -//////////////////////////////////////////////////////////////////////////////// -/// @} -//////////////////////////////////////////////////////////////////////////////// - -// ----------------------------------------------------------------------------- -// --SECTION-- module functions -// ----------------------------------------------------------------------------- - -//////////////////////////////////////////////////////////////////////////////// -/// @addtogroup ArangoDB -/// @{ -//////////////////////////////////////////////////////////////////////////////// - -//////////////////////////////////////////////////////////////////////////////// -/// @brief init http connection -//////////////////////////////////////////////////////////////////////////////// - -void TRI_InitMRConnection (MR_state_t* mrb); - -//////////////////////////////////////////////////////////////////////////////// -/// @} -//////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif - -#endif - -// Local Variables: -// mode: outline-minor -// outline-regexp: "/// @brief\\|/// {@inheritDoc}\\|/// @addtogroup\\|/// @page\\|// --SECTION--\\|/// @\\}" -// End: diff --git a/arangosh/Benchmark/arangob.cpp b/arangosh/Benchmark/arangob.cpp index af80a81853..044208ec9c 100644 --- a/arangosh/Benchmark/arangob.cpp +++ b/arangosh/Benchmark/arangob.cpp @@ -33,7 +33,7 @@ #include "Basics/ProgramOptions.h" #include "Basics/ProgramOptionsDescription.h" #include "Basics/StringUtils.h" -#include "BasicsC/init.h" +#include "Basics/init.h" #include "BasicsC/logging.h" #include "BasicsC/random.h" #include "BasicsC/tri-strings.h" diff --git a/arangosh/Benchmark/test-cases.h b/arangosh/Benchmark/test-cases.h index 66614144cc..5ed89ffed7 100644 --- a/arangosh/Benchmark/test-cases.h +++ b/arangosh/Benchmark/test-cases.h @@ -25,6 +25,8 @@ /// @author Copyright 2011-2013, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// +#include "Basics/Common.h" + using namespace std; using namespace triagens::httpclient; diff --git a/arangosh/V8Client/arangodump.cpp b/arangosh/V8Client/arangodump.cpp index 05685d14d2..9977140795 100644 --- a/arangosh/V8Client/arangodump.cpp +++ b/arangosh/V8Client/arangodump.cpp @@ -34,7 +34,7 @@ #include "Basics/ProgramOptionsDescription.h" #include "Basics/StringUtils.h" #include "BasicsC/files.h" -#include "BasicsC/init.h" +#include "Basics/init.h" #include "BasicsC/logging.h" #include "BasicsC/tri-strings.h" #include "BasicsC/terminal-utils.h" diff --git a/arangosh/V8Client/arangoimp.cpp b/arangosh/V8Client/arangoimp.cpp index 7e8a83d5d4..900d19bd6d 100644 --- a/arangosh/V8Client/arangoimp.cpp +++ b/arangosh/V8Client/arangoimp.cpp @@ -33,7 +33,7 @@ #include "Basics/ProgramOptionsDescription.h" #include "Basics/StringUtils.h" #include "BasicsC/files.h" -#include "BasicsC/init.h" +#include "Basics/init.h" #include "BasicsC/logging.h" #include "BasicsC/tri-strings.h" #include "BasicsC/terminal-utils.h" diff --git a/arangosh/V8Client/arangorestore.cpp b/arangosh/V8Client/arangorestore.cpp index 22a625125d..0497d9f490 100644 --- a/arangosh/V8Client/arangorestore.cpp +++ b/arangosh/V8Client/arangorestore.cpp @@ -34,7 +34,7 @@ #include "Basics/ProgramOptionsDescription.h" #include "Basics/StringUtils.h" #include "BasicsC/files.h" -#include "BasicsC/init.h" +#include "Basics/init.h" #include "BasicsC/logging.h" #include "BasicsC/tri-strings.h" #include "BasicsC/terminal-utils.h" diff --git a/arangosh/V8Client/arangosh.cpp b/arangosh/V8Client/arangosh.cpp index 4623caee44..044622ff55 100644 --- a/arangosh/V8Client/arangosh.cpp +++ b/arangosh/V8Client/arangosh.cpp @@ -38,7 +38,7 @@ #include "Basics/Utf8Helper.h" #include "BasicsC/csv.h" #include "BasicsC/files.h" -#include "BasicsC/init.h" +#include "Basics/init.h" #include "BasicsC/shell-colors.h" #include "BasicsC/terminal-utils.h" #include "BasicsC/tri-strings.h" diff --git a/lib/Admin/RestAdminBaseHandler.h b/lib/Admin/RestAdminBaseHandler.h index 3cb599e924..1e9337a8fb 100644 --- a/lib/Admin/RestAdminBaseHandler.h +++ b/lib/Admin/RestAdminBaseHandler.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_ADMIN_REST_ADMIN_BASE_HANDLER_H #define TRIAGENS_ADMIN_REST_ADMIN_BASE_HANDLER_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "Admin/RestBaseHandler.h" diff --git a/lib/Admin/RestAdminLogHandler.h b/lib/Admin/RestAdminLogHandler.h index f9e6957b0f..a77f6b196b 100644 --- a/lib/Admin/RestAdminLogHandler.h +++ b/lib/Admin/RestAdminLogHandler.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_ADMIN_REST_ADMIN_LOG_HANDLER_H #define TRIAGENS_ADMIN_REST_ADMIN_LOG_HANDLER_H 1 +#include "Basics/Common.h" + #include "Admin/RestAdminBaseHandler.h" namespace triagens { diff --git a/lib/Admin/RestBaseHandler.h b/lib/Admin/RestBaseHandler.h index 97bd79b4da..ebb808a5be 100644 --- a/lib/Admin/RestBaseHandler.h +++ b/lib/Admin/RestBaseHandler.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_ADMIN_REST_BASE_HANDLER_H #define TRIAGENS_ADMIN_REST_BASE_HANDLER_H 1 +#include "Basics/Common.h" + #include "HttpServer/HttpHandler.h" #include "BasicsC/json.h" diff --git a/lib/Admin/RestJobHandler.h b/lib/Admin/RestJobHandler.h index be40adbe1a..dd17e13f65 100644 --- a/lib/Admin/RestJobHandler.h +++ b/lib/Admin/RestJobHandler.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_ADMIN_REST_JOB_HANDLER_H #define TRIAGENS_ADMIN_REST_JOB_HANDLER_H 1 +#include "Basics/Common.h" + #include "Admin/RestBaseHandler.h" #include "HttpServer/AsyncJobManager.h" diff --git a/lib/Admin/RestShutdownHandler.h b/lib/Admin/RestShutdownHandler.h index 1457a47865..01b03f31c7 100644 --- a/lib/Admin/RestShutdownHandler.h +++ b/lib/Admin/RestShutdownHandler.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_ADMIN_REST_SHUTDOWN_HANDLER_H #define TRIAGENS_ADMIN_REST_SHUTDOWN_HANDLER_H 1 +#include "Basics/Common.h" + #include "ApplicationServer/ApplicationServer.h" #include "Admin/RestBaseHandler.h" diff --git a/lib/Admin/RestVersionHandler.h b/lib/Admin/RestVersionHandler.h index daa6bf0194..b2a78c3a97 100644 --- a/lib/Admin/RestVersionHandler.h +++ b/lib/Admin/RestVersionHandler.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_ADMIN_REST_VERSION_HANDLER_H #define TRIAGENS_ADMIN_REST_VERSION_HANDLER_H 1 +#include "Basics/Common.h" + #include "Admin/RestBaseHandler.h" #include "Rest/HttpResponse.h" diff --git a/lib/Basics/InitialiseBasics.cpp b/lib/Basics/InitialiseBasics.cpp index 2ddad1b880..7525d63a69 100644 --- a/lib/Basics/InitialiseBasics.cpp +++ b/lib/Basics/InitialiseBasics.cpp @@ -27,7 +27,7 @@ #include "Basics/InitialiseBasics.h" -#include "BasicsC/init.h" +#include "Basics/init.h" #include "BasicsC/error.h" #include "BasicsC/hashes.h" #include "BasicsC/logging.h" diff --git a/lib/BasicsC/init.c b/lib/Basics/init.cpp similarity index 100% rename from lib/BasicsC/init.c rename to lib/Basics/init.cpp diff --git a/lib/BasicsC/init.h b/lib/Basics/init.h similarity index 94% rename from lib/BasicsC/init.h rename to lib/Basics/init.h index f1c4cc1bd2..4025374088 100644 --- a/lib/BasicsC/init.h +++ b/lib/Basics/init.h @@ -25,14 +25,10 @@ /// @author Copyright 2011-2013, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -#ifndef TRIAGENS_BASICS_C_INIT_H -#define TRIAGENS_BASICS_C_INIT_H 1 +#ifndef TRIAGENS_BASICS_INIT_H +#define TRIAGENS_BASICS_INIT_H 1 -#include "BasicsC/common.h" - -#ifdef __cplusplus -extern "C" { -#endif +#include "Basics/Common.h" // ----------------------------------------------------------------------------- // --SECTION-- public functions @@ -77,10 +73,6 @@ void TRI_ShutdownC (void); /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/lib/BasicsC/debugging.c b/lib/BasicsC/debugging.c index 05a50637d3..e6fc86dd0e 100644 --- a/lib/BasicsC/debugging.c +++ b/lib/BasicsC/debugging.c @@ -26,8 +26,6 @@ //////////////////////////////////////////////////////////////////////////////// #include "BasicsC/common.h" - -#include "BasicsC/debugging.h" #include "BasicsC/locks.h" // ----------------------------------------------------------------------------- diff --git a/lib/BasicsC/fasthash.c b/lib/BasicsC/fasthash.c index 7a4437b531..b701e0c642 100644 --- a/lib/BasicsC/fasthash.c +++ b/lib/BasicsC/fasthash.c @@ -24,7 +24,6 @@ */ #include "fasthash.h" -#include "BasicsC/common.h" // Compression function for Merkle-Damgard construction. // This function is generated using the framework provided. diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 3ffeb31baf..0b293d570a 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -35,7 +35,6 @@ else () BasicsC/terminal-utils-posix.c BasicsC/threads-posix.c Rest/EndpointUnixDomain.cpp - Utilities/LinenoiseShell.cpp Utilities/ReadlineShell.cpp ) endif () @@ -79,7 +78,7 @@ add_library( BasicsC/fasthash.c BasicsC/files.c BasicsC/hashes.c - BasicsC/init.c + Basics/init.cpp BasicsC/json.c BasicsC/json-utilities.c BasicsC/linked-list.c @@ -103,8 +102,8 @@ add_library( BasicsC/voc-mimetypes.c BasicsC/tri-zip.c BasicsC/xxhash.c - JsonParser/json-parser.c - ProgramOptions/program-options.c + JsonParser/json-parser.cpp + ProgramOptions/program-options.cpp Rest/AnyServer.cpp Rest/EndpointList.cpp Rest/Endpoint.cpp diff --git a/lib/Dispatcher/ApplicationDispatcher.h b/lib/Dispatcher/ApplicationDispatcher.h index f6b0a8b532..fb08148ebf 100644 --- a/lib/Dispatcher/ApplicationDispatcher.h +++ b/lib/Dispatcher/ApplicationDispatcher.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_DISPATCHER_APPLICATION_DISPATCHER_H #define TRIAGENS_DISPATCHER_APPLICATION_DISPATCHER_H 1 +#include "Basics/Common.h" + #include "ApplicationServer/ApplicationFeature.h" #include "Scheduler/ApplicationScheduler.h" diff --git a/lib/Dispatcher/DispatcherThread.h b/lib/Dispatcher/DispatcherThread.h index f501dae21c..650f42997e 100644 --- a/lib/Dispatcher/DispatcherThread.h +++ b/lib/Dispatcher/DispatcherThread.h @@ -29,6 +29,8 @@ #ifndef TRIAGENS_DISPATCHER_DISPATCHER_THREAD_H #define TRIAGENS_DISPATCHER_DISPATCHER_THREAD_H 1 +#include "Basics/Common.h" + #include "Basics/Thread.h" #include "Dispatcher/Job.h" diff --git a/lib/Dispatcher/Job.h b/lib/Dispatcher/Job.h index a340a63d1e..2e97b81463 100644 --- a/lib/Dispatcher/Job.h +++ b/lib/Dispatcher/Job.h @@ -29,6 +29,8 @@ #ifndef TRIAGENS_DISPATCHER_JOB_H #define TRIAGENS_DISPATCHER_JOB_H 1 +#include "Basics/Common.h" + #include "Statistics/StatisticsAgent.h" // ----------------------------------------------------------------------------- diff --git a/lib/Dispatcher/RequeueTask.h b/lib/Dispatcher/RequeueTask.h index f7e175e085..443647b18d 100644 --- a/lib/Dispatcher/RequeueTask.h +++ b/lib/Dispatcher/RequeueTask.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_DISPATCHER_REQUEUE_TASK_H #define TRIAGENS_DISPATCHER_REQUEUE_TASK_H 1 +#include "Basics/Common.h" + #include "Scheduler/TimerTask.h" // ----------------------------------------------------------------------------- diff --git a/lib/GeneralServer/GeneralAsyncCommTask.h b/lib/GeneralServer/GeneralAsyncCommTask.h index 9d569752b6..8ac6146547 100644 --- a/lib/GeneralServer/GeneralAsyncCommTask.h +++ b/lib/GeneralServer/GeneralAsyncCommTask.h @@ -29,6 +29,8 @@ #ifndef TRIAGENS_GENERAL_SERVER_GENERAL_ASYNC_COMM_TASK_H #define TRIAGENS_GENERAL_SERVER_GENERAL_ASYNC_COMM_TASK_H 1 +#include "Basics/Common.h" + #include "GeneralServer/GeneralCommTask.h" #include "Basics/Exceptions.h" diff --git a/lib/GeneralServer/GeneralListenTask.h b/lib/GeneralServer/GeneralListenTask.h index 96f285e5b8..4243bf8c17 100644 --- a/lib/GeneralServer/GeneralListenTask.h +++ b/lib/GeneralServer/GeneralListenTask.h @@ -29,6 +29,8 @@ #ifndef TRIAGENS_GENERAL_SERVER_GENERAL_LISTEN_TASK_H #define TRIAGENS_GENERAL_SERVER_GENERAL_LISTEN_TASK_H 1 +#include "Basics/Common.h" + #include "BasicsC/socket-utils.h" #include "Scheduler/ListenTask.h" #include "Rest/Endpoint.h" diff --git a/lib/GeneralServer/GeneralServerDispatcher.h b/lib/GeneralServer/GeneralServerDispatcher.h index 59574ddd02..6599220002 100644 --- a/lib/GeneralServer/GeneralServerDispatcher.h +++ b/lib/GeneralServer/GeneralServerDispatcher.h @@ -29,6 +29,8 @@ #ifndef TRIAGENS_GENERAL_SERVER_GENERAL_SERVER_DISPATCHER_H #define TRIAGENS_GENERAL_SERVER_GENERAL_SERVER_DISPATCHER_H 1 +#include "Basics/Common.h" + #include "GeneralServer/GeneralServer.h" #include "Dispatcher/Dispatcher.h" diff --git a/lib/GeneralServer/GeneralServerJob.h b/lib/GeneralServer/GeneralServerJob.h index 15c9953ff5..39554bff38 100644 --- a/lib/GeneralServer/GeneralServerJob.h +++ b/lib/GeneralServer/GeneralServerJob.h @@ -29,6 +29,8 @@ #ifndef TRIAGENS_GENERAL_SERVER_GENERAL_SERVER_JOB_H #define TRIAGENS_GENERAL_SERVER_GENERAL_SERVER_JOB_H 1 +#include "Basics/Common.h" + #include "Dispatcher/Job.h" #include "Basics/Exceptions.h" diff --git a/lib/GeneralServer/GeneralSslServer.h b/lib/GeneralServer/GeneralSslServer.h index 971a9ad96c..e1f47af9b3 100644 --- a/lib/GeneralServer/GeneralSslServer.h +++ b/lib/GeneralServer/GeneralSslServer.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_GENERAL_SERVER_GENERAL_SSL_SERVER_H #define TRIAGENS_GENERAL_SERVER_GENERAL_SSL_SERVER_H 1 +#include "Basics/Common.h" + #include "GeneralServer/GeneralServer.h" #include "GeneralServer/SslAsyncCommTask.h" diff --git a/lib/GeneralServer/SpecificCommTask.h b/lib/GeneralServer/SpecificCommTask.h index e344d5e461..7a25a6f3f0 100644 --- a/lib/GeneralServer/SpecificCommTask.h +++ b/lib/GeneralServer/SpecificCommTask.h @@ -29,6 +29,8 @@ #ifndef TRIAGENS_GENERAL_SERVER_SPECIFIC_COMM_TASK_H #define TRIAGENS_GENERAL_SERVER_SPECIFIC_COMM_TASK_H 1 +#include "Basics/Common.h" + #include "GeneralServer/GeneralCommTask.h" namespace triagens { diff --git a/lib/GeneralServer/SslAsyncCommTask.h b/lib/GeneralServer/SslAsyncCommTask.h index ba8445ff63..19859853ab 100644 --- a/lib/GeneralServer/SslAsyncCommTask.h +++ b/lib/GeneralServer/SslAsyncCommTask.h @@ -29,6 +29,8 @@ #ifndef TRIAGENS_GENERAL_SERVER_SSL_ASYNC_COMM_TASK_H #define TRIAGENS_GENERAL_SERVER_SSL_ASYNC_COMM_TASK_H 1 +#include "Basics/Common.h" + #include "GeneralServer/GeneralAsyncCommTask.h" #include diff --git a/lib/HttpServer/ApplicationEndpointServer.h b/lib/HttpServer/ApplicationEndpointServer.h index 29761a0db0..cdf969bb29 100644 --- a/lib/HttpServer/ApplicationEndpointServer.h +++ b/lib/HttpServer/ApplicationEndpointServer.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_HTTP_SERVER_APPLICATION_ENDPOINT_SERVER_H #define TRIAGENS_HTTP_SERVER_APPLICATION_ENDPOINT_SERVER_H 1 +#include "Basics/Common.h" + #include "ApplicationServer/ApplicationFeature.h" #include diff --git a/lib/HttpServer/GeneralHttpServer.h b/lib/HttpServer/GeneralHttpServer.h index f3c3b492b8..831077c804 100644 --- a/lib/HttpServer/GeneralHttpServer.h +++ b/lib/HttpServer/GeneralHttpServer.h @@ -29,6 +29,8 @@ #ifndef TRIAGENS_HTTP_SERVER_GENERAL_HTTP_SERVER_H #define TRIAGENS_HTTP_SERVER_GENERAL_HTTP_SERVER_H 1 +#include "Basics/Common.h" + #include "GeneralServer/GeneralServerDispatcher.h" // ----------------------------------------------------------------------------- diff --git a/lib/HttpServer/HttpCommTask.h b/lib/HttpServer/HttpCommTask.h index ad744be46a..eef5eff43d 100644 --- a/lib/HttpServer/HttpCommTask.h +++ b/lib/HttpServer/HttpCommTask.h @@ -29,6 +29,8 @@ #ifndef TRIAGENS_HTTP_SERVER_HTTP_COMM_TASK_H #define TRIAGENS_HTTP_SERVER_HTTP_COMM_TASK_H 1 +#include "Basics/Common.h" + #include "GeneralServer/GeneralCommTask.h" #include "Basics/StringUtils.h" diff --git a/lib/HttpServer/HttpHandler.h b/lib/HttpServer/HttpHandler.h index 076d57cbb1..be58caf8ea 100644 --- a/lib/HttpServer/HttpHandler.h +++ b/lib/HttpServer/HttpHandler.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_HTTP_SERVER_HTTP_HANDLER_H #define TRIAGENS_HTTP_SERVER_HTTP_HANDLER_H 1 +#include "Basics/Common.h" + #include "Rest/Handler.h" #include "Rest/HttpResponse.h" diff --git a/lib/HttpServer/HttpServer.h b/lib/HttpServer/HttpServer.h index f4fd03c3c2..6323317f76 100644 --- a/lib/HttpServer/HttpServer.h +++ b/lib/HttpServer/HttpServer.h @@ -29,6 +29,8 @@ #ifndef TRIAGENS_HTTP_SERVER_HTTP_SERVER_H #define TRIAGENS_HTTP_SERVER_HTTP_SERVER_H 1 +#include "Basics/Common.h" + #include "HttpServer/GeneralHttpServer.h" #include "HttpServer/AsyncJobManager.h" diff --git a/lib/HttpServer/HttpsServer.h b/lib/HttpServer/HttpsServer.h index 3f0e08586c..a1e65b3552 100644 --- a/lib/HttpServer/HttpsServer.h +++ b/lib/HttpServer/HttpsServer.h @@ -30,6 +30,8 @@ #include "GeneralServer/GeneralSslServer.h" +#include "Basics/Common.h" + #include #include "Basics/ssl-helper.h" diff --git a/lib/JsonParser/json-parser.cpp b/lib/JsonParser/json-parser.cpp index 9d0f71d8d3..b63bdfaaff 100644 --- a/lib/JsonParser/json-parser.cpp +++ b/lib/JsonParser/json-parser.cpp @@ -26,7 +26,7 @@ /// @author Copyright 2011-2012, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/json.h" #include "BasicsC/tri-strings.h" @@ -2377,6 +2377,8 @@ static bool ParseObject (yyscan_t scanner, TRI_json_t* result, int c) { /// @brief parses a json string //////////////////////////////////////////////////////////////////////////////// +// Note: This function is mentioned in lib/BasicsC/json.h and therefore needs +// C linkage. Maybe, one day we can change this. extern "C" TRI_json_t* TRI_Json2String (TRI_memory_zone_t* zone, char const* text, char** error) { TRI_json_t* object; @@ -2440,6 +2442,8 @@ TRI_json_t* TRI_Json2String (TRI_memory_zone_t* zone, char const* text, char** e /// @brief parses a json string //////////////////////////////////////////////////////////////////////////////// +// Note: This function is mentioned in lib/BasicsC/json.h and therefore needs +// C linkage. Maybe, one day we can change this. extern "C" TRI_json_t* TRI_JsonString (TRI_memory_zone_t* zone, char const* text) { return TRI_Json2String(zone, text, 0); @@ -2449,6 +2453,8 @@ TRI_json_t* TRI_JsonString (TRI_memory_zone_t* zone, char const* text) { /// @brief parses a json file //////////////////////////////////////////////////////////////////////////////// +// Note: This function is mentioned in lib/BasicsC/json.h and therefore needs +// C linkage. Maybe, one day we can change this. extern "C" TRI_json_t* TRI_JsonFile (TRI_memory_zone_t* zone, char const* path, char** error) { FILE* in; diff --git a/lib/JsonParser/json-parser.ll b/lib/JsonParser/json-parser.ll index 1df5d5a2cf..641a6fc20e 100644 --- a/lib/JsonParser/json-parser.ll +++ b/lib/JsonParser/json-parser.ll @@ -26,7 +26,7 @@ /// @author Copyright 2011-2012, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/json.h" #include "BasicsC/tri-strings.h" @@ -463,6 +463,8 @@ static bool ParseObject (yyscan_t scanner, TRI_json_t* result, int c) { /// @brief parses a json string //////////////////////////////////////////////////////////////////////////////// +// Note: This function is mentioned in lib/BasicsC/json.h and therefore needs +// C linkage. Maybe, one day we can change this. extern "C" TRI_json_t* TRI_Json2String (TRI_memory_zone_t* zone, char const* text, char** error) { TRI_json_t* object; @@ -526,6 +528,8 @@ TRI_json_t* TRI_Json2String (TRI_memory_zone_t* zone, char const* text, char** e /// @brief parses a json string //////////////////////////////////////////////////////////////////////////////// +// Note: This function is mentioned in lib/BasicsC/json.h and therefore needs +// C linkage. Maybe, one day we can change this. extern "C" TRI_json_t* TRI_JsonString (TRI_memory_zone_t* zone, char const* text) { return TRI_Json2String(zone, text, 0); @@ -535,6 +539,8 @@ TRI_json_t* TRI_JsonString (TRI_memory_zone_t* zone, char const* text) { /// @brief parses a json file //////////////////////////////////////////////////////////////////////////////// +// Note: This function is mentioned in lib/BasicsC/json.h and therefore needs +// C linkage. Maybe, one day we can change this. extern "C" TRI_json_t* TRI_JsonFile (TRI_memory_zone_t* zone, char const* path, char** error) { FILE* in; diff --git a/lib/MRuby/MRLineEditor.h b/lib/MRuby/MRLineEditor.h index 8411f6bf1d..ec557e605d 100644 --- a/lib/MRuby/MRLineEditor.h +++ b/lib/MRuby/MRLineEditor.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_MRUBY_MRLINE_EDITOR_H #define TRIAGENS_MRUBY_MRLINE_EDITOR_H 1 +#include "Basics/Common.h" + #include "Utilities/LineEditor.h" #include "MRuby/mr-utils.h" diff --git a/lib/MRuby/MRLoader.h b/lib/MRuby/MRLoader.h index a187e0b46d..ef26bdefd5 100644 --- a/lib/MRuby/MRLoader.h +++ b/lib/MRuby/MRLoader.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_MRUBY_MRLOADER_H #define TRIAGENS_MRUBY_MRLOADER_H 1 +#include "Basics/Common.h" + #include "Utilities/ScriptLoader.h" #include diff --git a/lib/Makefile.files b/lib/Makefile.files index f2f2bf2cae..29d61c2c7e 100644 --- a/lib/Makefile.files +++ b/lib/Makefile.files @@ -45,7 +45,7 @@ lib_libarango_a_SOURCES = \ lib/BasicsC/fasthash.c \ lib/BasicsC/files.c \ lib/BasicsC/hashes.c \ - lib/BasicsC/init.c \ + lib/Basics/init.cpp \ lib/BasicsC/json.c \ lib/BasicsC/json-utilities.c \ lib/BasicsC/linked-list.c \ diff --git a/lib/Rest/EndpointIp.h b/lib/Rest/EndpointIp.h index 708a7894b5..e776546021 100644 --- a/lib/Rest/EndpointIp.h +++ b/lib/Rest/EndpointIp.h @@ -29,6 +29,8 @@ #ifndef TRIAGENS_REST_ENDPOINT_IP_H #define TRIAGENS_REST_ENDPOINT_IP_H 1 +#include "Basics/Common.h" + #include "Rest/Endpoint.h" namespace triagens { diff --git a/lib/Rest/EndpointIpV4.h b/lib/Rest/EndpointIpV4.h index 8e4e6d0b04..b3330ad3c6 100644 --- a/lib/Rest/EndpointIpV4.h +++ b/lib/Rest/EndpointIpV4.h @@ -28,8 +28,9 @@ #ifndef TRIAGENS_REST_ENDPOINT_IP_V4_H #define TRIAGENS_REST_ENDPOINT_IP_V4_H 1 -#include "Rest/EndpointIp.h" +#include "Basics/Common.h" +#include "Rest/EndpointIp.h" namespace triagens { namespace rest { diff --git a/lib/Rest/EndpointIpV6.h b/lib/Rest/EndpointIpV6.h index 75aeae66a6..0daabab33c 100644 --- a/lib/Rest/EndpointIpV6.h +++ b/lib/Rest/EndpointIpV6.h @@ -28,8 +28,9 @@ #ifndef TRIAGENS_REST_ENDPOINT_IP_V6_H #define TRIAGENS_REST_ENDPOINT_IP_V6_H 1 -#include "Rest/EndpointIp.h" +#include "Basics/Common.h" +#include "Rest/EndpointIp.h" namespace triagens { namespace rest { diff --git a/lib/Rest/Handler.h b/lib/Rest/Handler.h index 018420738e..e90eb9b814 100644 --- a/lib/Rest/Handler.h +++ b/lib/Rest/Handler.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_REST_HANDLER_H #define TRIAGENS_REST_HANDLER_H 1 +#include "Basics/Common.h" + #include "Statistics/StatisticsAgent.h" #include "Basics/Exceptions.h" diff --git a/lib/Rest/OperationMode.h b/lib/Rest/OperationMode.h index 513b5a5c35..49eed5ea51 100644 --- a/lib/Rest/OperationMode.h +++ b/lib/Rest/OperationMode.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_REST_OPERATION_MODE_H #define TRIAGENS_REST_OPERATION_MODE_H 1 +#include "Basics/Common.h" + #include "Basics/ProgramOptions.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/lib/Rest/RequestContext.h b/lib/Rest/RequestContext.h index 34d146f62d..fcda489e0b 100644 --- a/lib/Rest/RequestContext.h +++ b/lib/Rest/RequestContext.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_REST_REQUEST_CONTEXT_H #define TRIAGENS_REST_REQUEST_CONTEXT_H 1 +#include "Basics/Common.h" + #include "Rest/RequestUser.h" #include "Rest/HttpRequest.h" #include "Rest/HttpResponse.h" diff --git a/lib/Rest/RequestUser.h b/lib/Rest/RequestUser.h index 214eb5e1fa..1e2563eb37 100644 --- a/lib/Rest/RequestUser.h +++ b/lib/Rest/RequestUser.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_REST_REQUEST_USER_H #define TRIAGENS_REST_REQUEST_USER_H 1 +#include "Basics/Common.h" + namespace triagens { namespace rest { diff --git a/lib/Scheduler/ApplicationScheduler.h b/lib/Scheduler/ApplicationScheduler.h index 828c75385e..1705091199 100644 --- a/lib/Scheduler/ApplicationScheduler.h +++ b/lib/Scheduler/ApplicationScheduler.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_SCHEDULER_APPLICATION_SCHEDULER_H #define TRIAGENS_SCHEDULER_APPLICATION_SCHEDULER_H 1 +#include "Basics/Common.h" + #include "ApplicationServer/ApplicationFeature.h" // ----------------------------------------------------------------------------- diff --git a/lib/Scheduler/AsyncTask.h b/lib/Scheduler/AsyncTask.h index 3abdcca233..32e9f13df6 100644 --- a/lib/Scheduler/AsyncTask.h +++ b/lib/Scheduler/AsyncTask.h @@ -29,6 +29,8 @@ #ifndef TRIAGENS_SCHEDULER_ASYNC_TASK_H #define TRIAGENS_SCHEDULER_ASYNC_TASK_H 1 +#include "Basics/Common.h" + #include "Scheduler/Task.h" namespace triagens { diff --git a/lib/Scheduler/ListenTask.h b/lib/Scheduler/ListenTask.h index 733e287361..2afa4fc998 100644 --- a/lib/Scheduler/ListenTask.h +++ b/lib/Scheduler/ListenTask.h @@ -29,6 +29,8 @@ #ifndef TRIAGENS_SCHEDULER_LISTEN_TASK_H #define TRIAGENS_SCHEDULER_LISTEN_TASK_H 1 +#include "Basics/Common.h" + #ifdef TRI_HAVE_LINUX_SOCKETS #include #endif diff --git a/lib/Scheduler/Scheduler.h b/lib/Scheduler/Scheduler.h index decabac4db..216590bd33 100644 --- a/lib/Scheduler/Scheduler.h +++ b/lib/Scheduler/Scheduler.h @@ -29,6 +29,8 @@ #ifndef TRIAGENS_SCHEDULER_SCHEDULER_H #define TRIAGENS_SCHEDULER_SCHEDULER_H 1 +#include "Basics/Common.h" + #include "BasicsC/socket-utils.h" #include "Scheduler/TaskManager.h" diff --git a/lib/Scheduler/SchedulerLibev.h b/lib/Scheduler/SchedulerLibev.h index ed85a7cade..cbec52259c 100644 --- a/lib/Scheduler/SchedulerLibev.h +++ b/lib/Scheduler/SchedulerLibev.h @@ -29,6 +29,8 @@ #ifndef TRIAGENS_SCHEDULER_SCHEDULER_LIBEV_H #define TRIAGENS_SCHEDULER_SCHEDULER_LIBEV_H 1 +#include "Basics/Common.h" + #include "Scheduler/Scheduler.h" #include "BasicsC/locks.h" diff --git a/lib/Scheduler/SchedulerThread.h b/lib/Scheduler/SchedulerThread.h index 4124e738d1..8401958396 100644 --- a/lib/Scheduler/SchedulerThread.h +++ b/lib/Scheduler/SchedulerThread.h @@ -29,6 +29,8 @@ #ifndef TRIAGENS_SCHEDULER_SCHEDULER_THREAD_H #define TRIAGENS_SCHEDULER_SCHEDULER_THREAD_H 1 +#include "Basics/Common.h" + #include "Basics/Thread.h" #include "BasicsC/locks.h" diff --git a/lib/Scheduler/SignalTask.h b/lib/Scheduler/SignalTask.h index 5c72e05f2f..d847243343 100644 --- a/lib/Scheduler/SignalTask.h +++ b/lib/Scheduler/SignalTask.h @@ -29,6 +29,8 @@ #ifndef TRIAGENS_SCHEDULER_SIGNAL_TASK_H #define TRIAGENS_SCHEDULER_SIGNAL_TASK_H 1 +#include "Basics/Common.h" + #include "Scheduler/Task.h" #include "Basics/Mutex.h" diff --git a/lib/Scheduler/SocketTask.h b/lib/Scheduler/SocketTask.h index 31b78540b7..216c59f7ca 100644 --- a/lib/Scheduler/SocketTask.h +++ b/lib/Scheduler/SocketTask.h @@ -29,6 +29,8 @@ #ifndef TRIAGENS_SCHEDULER_SOCKET_TASK_H #define TRIAGENS_SCHEDULER_SOCKET_TASK_H 1 +#include "Basics/Common.h" + #include "Scheduler/Task.h" #include "Basics/Mutex.h" diff --git a/lib/Scheduler/TaskManager.h b/lib/Scheduler/TaskManager.h index 256ef17775..02a84eb1ad 100644 --- a/lib/Scheduler/TaskManager.h +++ b/lib/Scheduler/TaskManager.h @@ -31,6 +31,8 @@ #ifndef TRIAGENS_SCHEDULER_TASK_MANAGER_H #define TRIAGENS_SCHEDULER_TASK_MANAGER_H 1 +#include "Basics/Common.h" + #include "Scheduler/events.h" namespace triagens { diff --git a/lib/ShapedJson/Legends.h b/lib/ShapedJson/Legends.h index 0161a10c22..7fdcbabb44 100644 --- a/lib/ShapedJson/Legends.h +++ b/lib/ShapedJson/Legends.h @@ -29,7 +29,6 @@ #ifndef TRIAGENS_SHAPED_JSON_LEGENDS_H #define TRIAGENS_SHAPED_JSON_LEGENDS_H 1 -#include "BasicsC/common.h" #include "Basics/Common.h" #include "BasicsC/structures.h" diff --git a/lib/ShapedJson/json-shaper.h b/lib/ShapedJson/json-shaper.h index 10640bf891..883299e1c3 100644 --- a/lib/ShapedJson/json-shaper.h +++ b/lib/ShapedJson/json-shaper.h @@ -29,7 +29,10 @@ #ifndef TRIAGENS_SHAPED_JSON_JSON_SHAPER_H #define TRIAGENS_SHAPED_JSON_JSON_SHAPER_H 1 -#include "BasicsC/common.h" +// Note that this file is included in lib/BasicsC/init.c and thus must +// use C linkage. + +#include "Basics/Common.h" #include "BasicsC/json.h" #include "ShapedJson/shaped-json.h" @@ -169,10 +172,6 @@ static inline TRI_shape_sid_t TRI_FirstCustomShapeIdShaper (void) { return 7; } -#ifdef __cplusplus -extern "C" { -#endif - //////////////////////////////////////////////////////////////////////////////// /// @brief initialises global basic shape types //////////////////////////////////////////////////////////////////////////////// @@ -185,10 +184,6 @@ void TRI_InitialiseShaper (void); void TRI_ShutdownShaper (void); -#ifdef __cplusplus -} -#endif - #endif // ----------------------------------------------------------------------------- diff --git a/lib/ShapedJson/shape-accessor.h b/lib/ShapedJson/shape-accessor.h index ab1a93bda4..8dd9b7877c 100644 --- a/lib/ShapedJson/shape-accessor.h +++ b/lib/ShapedJson/shape-accessor.h @@ -28,15 +28,11 @@ #ifndef TRIAGENS_SHAPED_JSON_SHAPE_ACCESSOR_H #define TRIAGENS_SHAPED_JSON_SHAPE_ACCESSOR_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/json.h" #include "ShapedJson/shaped-json.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- public types // ----------------------------------------------------------------------------- @@ -117,10 +113,6 @@ void TRI_PrintShapeAccessor (TRI_shape_access_t*); /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/lib/ShapedJson/shaped-json.h b/lib/ShapedJson/shaped-json.h index 2c6aa6a322..32b33df858 100644 --- a/lib/ShapedJson/shaped-json.h +++ b/lib/ShapedJson/shaped-json.h @@ -29,14 +29,10 @@ #ifndef TRIAGENS_SHAPED_JSON_SHAPED_JSON_H #define TRIAGENS_SHAPED_JSON_SHAPED_JSON_H 1 -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "BasicsC/json.h" -#ifdef __cplusplus -extern "C" { -#endif - //////////////////////////////////////////////////////////////////////////////// /// @page ShapedJson JSON Shapes /// @@ -1131,10 +1127,6 @@ void TRI_PrintShapeValues (TRI_shape_value_t*, /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/lib/SimpleHttpClient/ClientConnection.h b/lib/SimpleHttpClient/ClientConnection.h index 12f8275b26..711d9615a1 100644 --- a/lib/SimpleHttpClient/ClientConnection.h +++ b/lib/SimpleHttpClient/ClientConnection.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_SIMPLE_HTTP_CLIENT_CLIENT_CONNECTION_H #define TRIAGENS_SIMPLE_HTTP_CLIENT_CLIENT_CONNECTION_H 1 +#include "Basics/Common.h" + #include "BasicsC/socket-utils.h" #include "SimpleHttpClient/GeneralClientConnection.h" diff --git a/lib/SimpleHttpClient/ConnectionManager.h b/lib/SimpleHttpClient/ConnectionManager.h index 0aaf11376b..c8d3262f07 100644 --- a/lib/SimpleHttpClient/ConnectionManager.h +++ b/lib/SimpleHttpClient/ConnectionManager.h @@ -28,7 +28,6 @@ #ifndef CONNECTION_MANAGER_H #define CONNECTION_MANAGER_H 1 -#include "BasicsC/common.h" #include "Basics/Common.h" #include "Basics/ReadWriteLock.h" #include "SimpleHttpClient/GeneralClientConnection.h" diff --git a/lib/SimpleHttpClient/SslClientConnection.h b/lib/SimpleHttpClient/SslClientConnection.h index f50ceca9e0..3d54099df1 100644 --- a/lib/SimpleHttpClient/SslClientConnection.h +++ b/lib/SimpleHttpClient/SslClientConnection.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_SIMPLE_HTTP_CLIENT_SSL_CLIENT_CONNECTION_H #define TRIAGENS_SIMPLE_HTTP_CLIENT_SSL_CLIENT_CONNECTION_H 1 +#include "Basics/Common.h" + #include "BasicsC/socket-utils.h" #include "SimpleHttpClient/GeneralClientConnection.h" diff --git a/lib/Statistics/statistics.h b/lib/Statistics/statistics.h index 84e8eb3391..eccbb0a438 100644 --- a/lib/Statistics/statistics.h +++ b/lib/Statistics/statistics.h @@ -28,7 +28,6 @@ #ifndef TRIAGENS_STATISTICS_STATISTICS_H #define TRIAGENS_STATISTICS_STATISTICS_H 1 -#include "BasicsC/common.h" #include "Basics/Common.h" #include "Rest/HttpRequest.h" #include "Statistics/figures.h" diff --git a/lib/Utilities/Completer.h b/lib/Utilities/Completer.h index 3085e92901..63dcb55653 100644 --- a/lib/Utilities/Completer.h +++ b/lib/Utilities/Completer.h @@ -29,8 +29,7 @@ #ifndef TRIAGENS_UTILITIES_COMPLETER_H #define TRIAGENS_UTILITIES_COMPLETER_H 1 -#include -#include +#include "Basics/Common.h" namespace triagens { using namespace std; diff --git a/lib/Utilities/LinenoiseShell.h b/lib/Utilities/LinenoiseShell.h index dbd665e922..7c2b14f560 100644 --- a/lib/Utilities/LinenoiseShell.h +++ b/lib/Utilities/LinenoiseShell.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_UTILITIES_LINENOISESHELL_H #define TRIAGENS_UTILITIES_LINENOISESHELL_H 1 -#include +#include "Basics/Common.h" #include "Completer.h" #include "ShellImplementation.h" diff --git a/lib/Utilities/ReadlineShell.h b/lib/Utilities/ReadlineShell.h index 601eaa7f7d..eb51e61c1b 100644 --- a/lib/Utilities/ReadlineShell.h +++ b/lib/Utilities/ReadlineShell.h @@ -28,7 +28,8 @@ #ifndef TRIAGENS_UTILITIES_READLINE_SHELL_H #define TRIAGENS_UTILITIES_READLINE_SHELL_H 1 -#include +#include "Basics/Common.h" + #include "ShellImplementation.h" #include "Completer.h" diff --git a/lib/Utilities/ShellImplFactory.h b/lib/Utilities/ShellImplFactory.h index b16f389493..53e50d32c2 100644 --- a/lib/Utilities/ShellImplFactory.h +++ b/lib/Utilities/ShellImplFactory.h @@ -29,7 +29,7 @@ #ifndef TRIAGENS_UTILITIES_SHELLIMPL_FACTORY_H #define TRIAGENS_UTILITIES_SHELLIMPL_FACTORY_H 1 -#include +#include "Basics/Common.h" namespace triagens { using namespace std; diff --git a/lib/Utilities/ShellImplementation.h b/lib/Utilities/ShellImplementation.h index 1c7ed9c6a7..b4c011b678 100644 --- a/lib/Utilities/ShellImplementation.h +++ b/lib/Utilities/ShellImplementation.h @@ -28,7 +28,7 @@ #ifndef TRIAGENS_UTILITIES_SHELL_IMPLEMENTATION_H #define TRIAGENS_UTILITIES_SHELL_IMPLEMENTATION_H 1 -#include +#include "Basics/Common.h" #include "Completer.h" diff --git a/lib/V8/JSLoader.h b/lib/V8/JSLoader.h index 010eb1170f..2c27bcf419 100644 --- a/lib/V8/JSLoader.h +++ b/lib/V8/JSLoader.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_V8_JSLOADER_H #define TRIAGENS_V8_JSLOADER_H 1 +#include "Basics/Common.h" + #include "Utilities/ScriptLoader.h" #include diff --git a/lib/V8/V8LineEditor.h b/lib/V8/V8LineEditor.h index 1125f8b0ce..7f5147e190 100644 --- a/lib/V8/V8LineEditor.h +++ b/lib/V8/V8LineEditor.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_V8_V8LINE_EDITOR_H #define TRIAGENS_V8_V8LINE_EDITOR_H 1 +#include "Basics/Common.h" + #include "Utilities/LineEditor.h" #include "Utilities/Completer.h" diff --git a/lib/V8/v8-buffer.h b/lib/V8/v8-buffer.h index 763d819967..e0ef74c8b0 100644 --- a/lib/V8/v8-buffer.h +++ b/lib/V8/v8-buffer.h @@ -51,6 +51,8 @@ #ifndef TRIAGENS_V8_V8_BUFFER_H #define TRIAGENS_V8_V8_BUFFER_H 1 +#include "Basics/Common.h" + #include "V8/v8-wrapper.h" // ----------------------------------------------------------------------------- diff --git a/lib/V8/v8-conv.h b/lib/V8/v8-conv.h index b050147dfb..1184d7a247 100644 --- a/lib/V8/v8-conv.h +++ b/lib/V8/v8-conv.h @@ -28,6 +28,8 @@ #ifndef TRIAGENS_V8_V8_CONV_H #define TRIAGENS_V8_V8_CONV_H 1 +#include "Basics/Common.h" + #include "V8/v8-globals.h" #include "BasicsC/json.h" diff --git a/lib/V8/v8-execution.h b/lib/V8/v8-execution.h index 621a4b0295..e79d58a9a6 100644 --- a/lib/V8/v8-execution.h +++ b/lib/V8/v8-execution.h @@ -28,15 +28,10 @@ #ifndef TRIAGENS_V8_V8_EXECUTION_H #define TRIAGENS_V8_V8_EXECUTION_H 1 -#include "BasicsC/common.h" #include "Basics/Common.h" #include -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- forward declarations // ----------------------------------------------------------------------------- @@ -85,10 +80,6 @@ void TRI_FreeExecutionContext (TRI_js_exec_context_t*); struct TRI_json_s* TRI_ExecuteResultContext (TRI_js_exec_context_t* context); -#ifdef __cplusplus -} -#endif - #endif // ----------------------------------------------------------------------------- diff --git a/lib/V8/v8-json.cpp b/lib/V8/v8-json.cpp index d896962ac5..24e2a6a894 100644 --- a/lib/V8/v8-json.cpp +++ b/lib/V8/v8-json.cpp @@ -26,7 +26,9 @@ /// @author Copyright 2011, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -#include "V8/v8-json.h" +#include "Basics/Common.h" + +#include "V8/v8-globals.h" #include "BasicsC/tri-strings.h" #include "BasicsC/logging.h" @@ -44,7 +46,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 37 +#define YY_FLEX_SUBMINOR_VERSION 35 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -194,7 +196,15 @@ typedef void* yyscan_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else #define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -206,11 +216,6 @@ typedef void* yyscan_t; typedef struct yy_buffer_state *YY_BUFFER_STATE; #endif -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 @@ -233,6 +238,11 @@ typedef size_t yy_size_t; #define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner ) +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + #ifndef YY_STRUCT_YY_BUFFER_STATE #define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state @@ -250,7 +260,7 @@ struct yy_buffer_state /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -329,7 +339,7 @@ static void tri_v8__init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanne YY_BUFFER_STATE tri_v8__scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); YY_BUFFER_STATE tri_v8__scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); -YY_BUFFER_STATE tri_v8__scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner ); +YY_BUFFER_STATE tri_v8__scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner ); void *tri_v8_alloc (yy_size_t ,yyscan_t yyscanner ); void *tri_v8_realloc (void *,yy_size_t ,yyscan_t yyscanner ); @@ -361,7 +371,7 @@ void tri_v8_free (void * ,yyscan_t yyscanner ); /* Begin user sect3 */ -#define tri_v8_wrap(yyscanner) 1 +#define tri_v8_wrap(n) 1 #define YY_SKIP_YYWRAP typedef unsigned char YY_CHAR; @@ -552,8 +562,8 @@ struct yyguts_t size_t yy_buffer_stack_max; /**< capacity of stack. */ YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */ char yy_hold_char; - yy_size_t yy_n_chars; - yy_size_t yyleng_r; + int yy_n_chars; + int yyleng_r; char *yy_c_buf_p; int yy_init; int yy_start; @@ -600,7 +610,7 @@ FILE *tri_v8_get_out (yyscan_t yyscanner ); void tri_v8_set_out (FILE * out_str ,yyscan_t yyscanner ); -yy_size_t tri_v8_get_leng (yyscan_t yyscanner ); +int tri_v8_get_leng (yyscan_t yyscanner ); char *tri_v8_get_text (yyscan_t yyscanner ); @@ -644,7 +654,12 @@ static int input (yyscan_t yyscanner ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else #define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -1110,21 +1125,21 @@ static int yy_get_next_buffer (yyscan_t yyscanner) else { - yy_size_t num_to_read = + int num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) { /* Not enough room in the buffer - grow it. */ /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE; + YY_BUFFER_STATE b = YY_CURRENT_BUFFER; int yy_c_buf_p_offset = (int) (yyg->yy_c_buf_p - b->yy_ch_buf); if ( b->yy_is_our_buffer ) { - yy_size_t new_size = b->yy_buf_size * 2; + int new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -1155,7 +1170,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) /* Read in more data. */ YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - yyg->yy_n_chars, num_to_read ); + yyg->yy_n_chars, (int) num_to_read ); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; } @@ -1252,7 +1267,6 @@ static int yy_get_next_buffer (yyscan_t yyscanner) yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_is_jam = (yy_current_state == 42); - (void)yyg; return yy_is_jam ? 0 : yy_current_state; } @@ -1281,7 +1295,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) else { /* need more input */ - yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr; + int offset = yyg->yy_c_buf_p - yyg->yytext_ptr; ++yyg->yy_c_buf_p; switch ( yy_get_next_buffer( yyscanner ) ) @@ -1445,6 +1459,10 @@ static void tri_v8__load_buffer_state (yyscan_t yyscanner) tri_v8_free((void *) b ,yyscanner ); } +#ifndef __cplusplus +extern int isatty (int ); +#endif /* __cplusplus */ + /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, * such as during a tri_v8_restart() or at EOF. @@ -1561,7 +1579,7 @@ void tri_v8_pop_buffer_state (yyscan_t yyscanner) */ static void tri_v8_ensure_buffer_stack (yyscan_t yyscanner) { - yy_size_t num_to_alloc; + int num_to_alloc; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if (!yyg->yy_buffer_stack) { @@ -1659,7 +1677,7 @@ YY_BUFFER_STATE tri_v8__scan_string (yyconst char * yystr , yyscan_t yyscanner) * @param yyscanner The scanner object. * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE tri_v8__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len , yyscan_t yyscanner) +YY_BUFFER_STATE tri_v8__scan_bytes (yyconst char * yybytes, int _yybytes_len , yyscan_t yyscanner) { YY_BUFFER_STATE b; char *buf; @@ -1774,7 +1792,7 @@ FILE *tri_v8_get_out (yyscan_t yyscanner) /** Get the length of the current token. * @param yyscanner The scanner object. */ -yy_size_t tri_v8_get_leng (yyscan_t yyscanner) +int tri_v8_get_leng (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyleng; @@ -1810,7 +1828,7 @@ void tri_v8_set_lineno (int line_number , yyscan_t yyscanner) /* lineno is only valid if an input buffer exists. */ if (! YY_CURRENT_BUFFER ) - YY_FATAL_ERROR( "tri_v8_set_lineno called with no buffer" ); + yy_fatal_error( "tri_v8_set_lineno called with no buffer" , yyscanner); yylineno = line_number; } @@ -1825,7 +1843,7 @@ void tri_v8_set_column (int column_no , yyscan_t yyscanner) /* column is only valid if an input buffer exists. */ if (! YY_CURRENT_BUFFER ) - YY_FATAL_ERROR( "tri_v8_set_column called with no buffer" ); + yy_fatal_error( "tri_v8_set_column called with no buffer" , yyscanner); yycolumn = column_no; } diff --git a/lib/V8/v8-json.ll b/lib/V8/v8-json.ll index 7cf783e5a1..80aa40dd86 100644 --- a/lib/V8/v8-json.ll +++ b/lib/V8/v8-json.ll @@ -26,7 +26,7 @@ /// @author Copyright 2011, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -#include "BasicsC/common.h" +#include "Basics/Common.h" #include "V8/v8-globals.h"