diff --git a/arangod/Actions/actions.h b/arangod/Actions/actions.h index c81b11dcdd..b2f0c071c8 100644 --- a/arangod/Actions/actions.h +++ b/arangod/Actions/actions.h @@ -35,7 +35,7 @@ // --SECTION-- forward declarations // ----------------------------------------------------------------------------- -extern "C" struct TRI_vocbase_s; +struct TRI_vocbase_s; namespace triagens { namespace rest { diff --git a/arangod/Cluster/ApplicationCluster.h b/arangod/Cluster/ApplicationCluster.h index 58f9de88c4..d22258657b 100644 --- a/arangod/Cluster/ApplicationCluster.h +++ b/arangod/Cluster/ApplicationCluster.h @@ -33,9 +33,7 @@ #include "ApplicationServer/ApplicationFeature.h" #include "Cluster/ServerState.h" -extern "C" { - struct TRI_server_s; -} +struct TRI_server_s; namespace triagens { namespace rest { diff --git a/arangod/Cluster/ClusterInfo.h b/arangod/Cluster/ClusterInfo.h index 2e2bb92cfb..a1f039b734 100644 --- a/arangod/Cluster/ClusterInfo.h +++ b/arangod/Cluster/ClusterInfo.h @@ -37,11 +37,9 @@ #include "VocBase/voc-types.h" #include "VocBase/vocbase.h" -extern "C" { - struct TRI_json_s; - struct TRI_memory_zone_s; - struct TRI_server_s; -} +struct TRI_json_s; +struct TRI_memory_zone_s; +struct TRI_server_s; namespace triagens { namespace arango { diff --git a/arangod/Cluster/ClusterMethods.h b/arangod/Cluster/ClusterMethods.h index b7b9bf4d47..5431c5d4aa 100644 --- a/arangod/Cluster/ClusterMethods.h +++ b/arangod/Cluster/ClusterMethods.h @@ -43,10 +43,8 @@ #include "Cluster/ServerState.h" #include "Cluster/ClusterComm.h" -extern "C" { - struct TRI_json_s; - struct TRI_vector_pointer_s; -} +struct TRI_json_s; +struct TRI_vector_pointer_s; namespace triagens { namespace arango { diff --git a/arangod/Cluster/HeartbeatThread.h b/arangod/Cluster/HeartbeatThread.h index abbaf4097a..8bad4d1ef1 100644 --- a/arangod/Cluster/HeartbeatThread.h +++ b/arangod/Cluster/HeartbeatThread.h @@ -34,9 +34,7 @@ #include "BasicsC/logging.h" #include "Cluster/AgencyComm.h" -extern "C" { - struct TRI_server_s; -} +struct TRI_server_s; namespace triagens { namespace rest { diff --git a/arangod/Cluster/ServerJob.h b/arangod/Cluster/ServerJob.h index 2b1fd60347..038d47e63f 100644 --- a/arangod/Cluster/ServerJob.h +++ b/arangod/Cluster/ServerJob.h @@ -36,9 +36,7 @@ #include "Basics/Mutex.h" #include "Rest/Handler.h" -extern "C" { - struct TRI_server_s; -} +struct TRI_server_s; // ----------------------------------------------------------------------------- // --SECTION-- class ServerJob diff --git a/arangod/FulltextIndex/fulltext-handles.h b/arangod/FulltextIndex/fulltext-handles.h index ca1f6b8085..c3d44a1b47 100644 --- a/arangod/FulltextIndex/fulltext-handles.h +++ b/arangod/FulltextIndex/fulltext-handles.h @@ -30,10 +30,6 @@ #include "fulltext-common.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- public types // ----------------------------------------------------------------------------- @@ -221,10 +217,6 @@ size_t TRI_MemoryHandleFulltextIndex (const TRI_fulltext_handles_t* const); /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/FulltextIndex/fulltext-list.h b/arangod/FulltextIndex/fulltext-list.h index 4f31ee0a4b..006cdef8a1 100644 --- a/arangod/FulltextIndex/fulltext-list.h +++ b/arangod/FulltextIndex/fulltext-list.h @@ -30,10 +30,6 @@ #include "fulltext-common.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- public types // ----------------------------------------------------------------------------- @@ -169,10 +165,6 @@ TRI_fulltext_list_entry_t* TRI_StartListFulltextIndex (const TRI_fulltext_list_t /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/FulltextIndex/fulltext-result.h b/arangod/FulltextIndex/fulltext-result.h index e15b707017..0ce7f86970 100644 --- a/arangod/FulltextIndex/fulltext-result.h +++ b/arangod/FulltextIndex/fulltext-result.h @@ -30,10 +30,6 @@ #include "fulltext-common.h" -#ifdef __cplusplus -extern "C" { -#endif - // ----------------------------------------------------------------------------- // --SECTION-- public types // ----------------------------------------------------------------------------- @@ -88,10 +84,6 @@ void TRI_FreeResultFulltextIndex (TRI_fulltext_result_t*); /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/IndexOperators/index-operator.h b/arangod/IndexOperators/index-operator.h index 1e74940a8d..577b877c84 100644 --- a/arangod/IndexOperators/index-operator.h +++ b/arangod/IndexOperators/index-operator.h @@ -35,11 +35,6 @@ #include "ShapedJson/shaped-json.h" #include "VocBase/vocbase.h" -#ifdef __cplusplus -extern "C" { -#endif - - // ----------------------------------------------------------------------------- // --SECTION-- public types // ----------------------------------------------------------------------------- @@ -193,10 +188,6 @@ typedef int (*TRI_index_query_free_method_call_t) (void*, void*); /// @} //////////////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -} -#endif - #endif // Local Variables: diff --git a/arangod/RestHandler/RestVocbaseBaseHandler.h b/arangod/RestHandler/RestVocbaseBaseHandler.h index 113ea41960..b864ab65bc 100644 --- a/arangod/RestHandler/RestVocbaseBaseHandler.h +++ b/arangod/RestHandler/RestVocbaseBaseHandler.h @@ -47,12 +47,10 @@ // --SECTION-- forward declarations // ----------------------------------------------------------------------------- -extern "C" { - struct TRI_json_s; - struct TRI_primary_collection_s; - struct TRI_vocbase_col_s; - struct TRI_vocbase_s; -} +struct TRI_json_s; +struct TRI_primary_collection_s; +struct TRI_vocbase_col_s; +struct TRI_vocbase_s; // ----------------------------------------------------------------------------- // --SECTION-- class RestVocbaseBaseHandler diff --git a/arangod/RestServer/ArangoServer.h b/arangod/RestServer/ArangoServer.h index 765962fcb5..f28044b9fb 100644 --- a/arangod/RestServer/ArangoServer.h +++ b/arangod/RestServer/ArangoServer.h @@ -39,10 +39,8 @@ #include "VocBase/vocbase.h" -extern "C" { - struct TRI_server_s; - struct TRI_vocbase_defaults_s; -} +struct TRI_server_s; +struct TRI_vocbase_defaults_s; // ----------------------------------------------------------------------------- // --SECTION-- forward declarations diff --git a/arangod/RestServer/ConsoleThread.h b/arangod/RestServer/ConsoleThread.h index 4cfe8bce1c..a9a1a3b52c 100644 --- a/arangod/RestServer/ConsoleThread.h +++ b/arangod/RestServer/ConsoleThread.h @@ -32,9 +32,7 @@ #include "Basics/Thread.h" #include "V8Server/ApplicationV8.h" -extern "C" { - struct TRI_vocbase_s; -} +struct TRI_vocbase_s; namespace triagens { namespace rest { diff --git a/arangod/RestServer/VocbaseContext.h b/arangod/RestServer/VocbaseContext.h index e4e5982eaa..1347709765 100644 --- a/arangod/RestServer/VocbaseContext.h +++ b/arangod/RestServer/VocbaseContext.h @@ -34,10 +34,8 @@ #include "Rest/HttpResponse.h" #include "Rest/RequestContext.h" -extern "C" { - struct TRI_server_s; - struct TRI_vocbase_s; -} +struct TRI_server_s; +struct TRI_vocbase_s; // ----------------------------------------------------------------------------- // --SECTION-- forward declarations diff --git a/arangod/V8Server/ApplicationV8.h b/arangod/V8Server/ApplicationV8.h index ef054919a6..0114706e67 100644 --- a/arangod/V8Server/ApplicationV8.h +++ b/arangod/V8Server/ApplicationV8.h @@ -41,10 +41,8 @@ // --SECTION-- forward declarations // ----------------------------------------------------------------------------- -extern "C" { - struct TRI_server_s; - struct TRI_vocbase_s; -} +struct TRI_server_s; +struct TRI_vocbase_s; namespace triagens { namespace basics { diff --git a/arangod/V8Server/V8Job.h b/arangod/V8Server/V8Job.h index 5144bfd27d..72004bce9f 100644 --- a/arangod/V8Server/V8Job.h +++ b/arangod/V8Server/V8Job.h @@ -33,9 +33,7 @@ #include "Dispatcher/Job.h" #include "BasicsC/json.h" -extern "C" { - struct TRI_vocbase_s; -} +struct TRI_vocbase_s; // ----------------------------------------------------------------------------- // --SECTION-- class V8Job diff --git a/arangod/V8Server/V8PeriodicTask.h b/arangod/V8Server/V8PeriodicTask.h index e555e6a82c..75153a18cc 100644 --- a/arangod/V8Server/V8PeriodicTask.h +++ b/arangod/V8Server/V8PeriodicTask.h @@ -34,9 +34,7 @@ #include "VocBase/vocbase.h" -extern "C" { - struct TRI_json_s; -} +struct TRI_json_s; // ----------------------------------------------------------------------------- // --SECTION-- class V8PeriodicTask diff --git a/arangod/V8Server/V8TimerTask.h b/arangod/V8Server/V8TimerTask.h index a8d639a877..164350e18d 100644 --- a/arangod/V8Server/V8TimerTask.h +++ b/arangod/V8Server/V8TimerTask.h @@ -34,9 +34,7 @@ #include "VocBase/vocbase.h" -extern "C" { - struct TRI_json_s; -} +struct TRI_json_s; // ----------------------------------------------------------------------------- // --SECTION-- class V8TimerTask diff --git a/arangod/V8Server/v8-vocbase.h b/arangod/V8Server/v8-vocbase.h index beac677830..fc84c1276e 100644 --- a/arangod/V8Server/v8-vocbase.h +++ b/arangod/V8Server/v8-vocbase.h @@ -35,10 +35,8 @@ #include "Utils/CollectionNameResolver.h" #include "VocBase/document-collection.h" -extern "C" { - struct TRI_server_s; - struct TRI_vocbase_s; -} +struct TRI_server_s; +struct TRI_vocbase_s; namespace triagens { namespace arango { diff --git a/arangod/Wal/Slot.h b/arangod/Wal/Slot.h index d2f63aac1d..c42d5ca6c1 100644 --- a/arangod/Wal/Slot.h +++ b/arangod/Wal/Slot.h @@ -32,9 +32,7 @@ #include "ShapedJson/Legends.h" #include "Wal/Logfile.h" -extern "C" { - struct TRI_df_marker_s; -} +struct TRI_df_marker_s; namespace triagens { namespace wal { diff --git a/arangoirb/MRClient/MRubyClientConnection.cpp b/arangoirb/MRClient/MRubyClientConnection.cpp index 4c024a7038..c7c66bc04c 100644 --- a/arangoirb/MRClient/MRubyClientConnection.cpp +++ b/arangoirb/MRClient/MRubyClientConnection.cpp @@ -39,10 +39,8 @@ #include "SimpleHttpClient/SimpleHttpClient.h" #include "SimpleHttpClient/SimpleHttpResult.h" -extern "C" { #include "mruby/array.h" #include "mruby/hash.h" -} using namespace triagens::basics; using namespace triagens::httpclient; diff --git a/lib/Scheduler/PeriodicTask.h b/lib/Scheduler/PeriodicTask.h index b8e99a612d..2b6eeaeacc 100644 --- a/lib/Scheduler/PeriodicTask.h +++ b/lib/Scheduler/PeriodicTask.h @@ -32,9 +32,7 @@ #include "Basics/Common.h" #include "Scheduler/Task.h" -extern "C" { - struct TRI_json_s; -} +struct TRI_json_s; namespace triagens { namespace rest { diff --git a/lib/Scheduler/Scheduler.h b/lib/Scheduler/Scheduler.h index 216590bd33..6e01ff3808 100644 --- a/lib/Scheduler/Scheduler.h +++ b/lib/Scheduler/Scheduler.h @@ -40,9 +40,7 @@ // --SECTION-- forward declarations // ----------------------------------------------------------------------------- -extern "C" { - struct TRI_json_s; -} +struct TRI_json_s; namespace triagens { namespace basics { diff --git a/lib/Scheduler/Task.h b/lib/Scheduler/Task.h index 1bd5c7c392..34e5a8e787 100644 --- a/lib/Scheduler/Task.h +++ b/lib/Scheduler/Task.h @@ -35,9 +35,7 @@ #include "Scheduler/events.h" -extern "C" { - struct TRI_json_s; -} +struct TRI_json_s; namespace triagens { namespace rest { diff --git a/lib/Scheduler/TimerTask.h b/lib/Scheduler/TimerTask.h index 5093fae72b..3e3ca43091 100644 --- a/lib/Scheduler/TimerTask.h +++ b/lib/Scheduler/TimerTask.h @@ -32,9 +32,7 @@ #include "Basics/Common.h" #include "Scheduler/Task.h" -extern "C" { - struct TRI_json_s; -} +struct TRI_json_s; namespace triagens { namespace rest { diff --git a/lib/Utilities/LinenoiseShell.cpp b/lib/Utilities/LinenoiseShell.cpp index d26b36624e..72aea4efdc 100644 --- a/lib/Utilities/LinenoiseShell.cpp +++ b/lib/Utilities/LinenoiseShell.cpp @@ -29,16 +29,10 @@ #include "Utilities/Completer.h" #include "Utilities/LineEditor.h" -#include "V8/v8-utils.h" - extern "C" { #include } -#include -#include - -#include "BasicsC/tri-strings.h" #include "BasicsC/files.h" using namespace std;