Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh

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 {

arangod/Cluster/ApplicationCluster.h

@@ -33,9 +33,7 @@
 #include "ApplicationServer/ApplicationFeature.h"
 #include "Cluster/ServerState.h"
 
-extern "C" {
 struct TRI_server_s;
-}
 
 namespace triagens {
   namespace rest {

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;
-}
 
 namespace triagens {
   namespace arango {

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;
-}
 
 namespace triagens {
   namespace arango {

arangod/Cluster/HeartbeatThread.h

@@ -34,9 +34,7 @@
 #include "BasicsC/logging.h"
 #include "Cluster/AgencyComm.h"
 
-extern "C" {
 struct TRI_server_s;
-}
 
 namespace triagens {
   namespace rest {

arangod/Cluster/ServerJob.h

@@ -36,9 +36,7 @@
 #include "Basics/Mutex.h"
 #include "Rest/Handler.h"
 
-extern "C" {
 struct TRI_server_s;
-}
 
 // -----------------------------------------------------------------------------
 // --SECTION--                                                 class ServerJob

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:

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:

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:

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:

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;
-}
 
 // -----------------------------------------------------------------------------
 // --SECTION--                                      class RestVocbaseBaseHandler

arangod/RestServer/ArangoServer.h

@@ -39,10 +39,8 @@
 
 #include "VocBase/vocbase.h"
 
-extern "C" {
 struct TRI_server_s;
 struct TRI_vocbase_defaults_s;
-}
 
 // -----------------------------------------------------------------------------
 // --SECTION--                                              forward declarations

arangod/RestServer/ConsoleThread.h

@@ -32,9 +32,7 @@
 #include "Basics/Thread.h"
 #include "V8Server/ApplicationV8.h"
 
-extern "C" {
 struct TRI_vocbase_s;
-}
 
 namespace triagens {
   namespace rest {

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;
-}
 
 // -----------------------------------------------------------------------------
 // --SECTION--                                              forward declarations

arangod/V8Server/ApplicationV8.h

@@ -41,10 +41,8 @@
 // --SECTION--                                              forward declarations
 // -----------------------------------------------------------------------------
 
-extern "C" {
 struct TRI_server_s;
 struct TRI_vocbase_s;
-}
 
 namespace triagens {
   namespace basics {

arangod/V8Server/V8Job.h

@@ -33,9 +33,7 @@
 #include "Dispatcher/Job.h"
 #include "BasicsC/json.h"
 
-extern "C" {
 struct TRI_vocbase_s;
-}
 
 // -----------------------------------------------------------------------------
 // --SECTION--                                                       class V8Job

arangod/V8Server/V8PeriodicTask.h

@@ -34,9 +34,7 @@
 
 #include "VocBase/vocbase.h"
 
-extern "C" {
 struct TRI_json_s;
-}
 
 // -----------------------------------------------------------------------------
 // --SECTION--                                              class V8PeriodicTask

arangod/V8Server/V8TimerTask.h

@@ -34,9 +34,7 @@
 
 #include "VocBase/vocbase.h"
 
-extern "C" {
 struct TRI_json_s;
-}
 
 // -----------------------------------------------------------------------------
 // --SECTION--                                                 class V8TimerTask

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;
-}
 
 namespace triagens {
   namespace arango {

arangod/Wal/Slot.h

@@ -32,9 +32,7 @@
 #include "ShapedJson/Legends.h"
 #include "Wal/Logfile.h"
 
-extern "C" {
 struct TRI_df_marker_s;
-}
 
 namespace triagens {
   namespace wal {

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;

lib/Scheduler/PeriodicTask.h

@@ -32,9 +32,7 @@
 #include "Basics/Common.h"
 #include "Scheduler/Task.h"
 
-extern "C" {
 struct TRI_json_s;
-}
 
 namespace triagens {
   namespace rest {

lib/Scheduler/Scheduler.h

@@ -40,9 +40,7 @@
 // --SECTION--                                              forward declarations
 // -----------------------------------------------------------------------------
 
-extern "C" {
 struct TRI_json_s;
-}
 
 namespace triagens {
   namespace basics {

lib/Scheduler/Task.h

@@ -35,9 +35,7 @@
 
 #include "Scheduler/events.h"
 
-extern "C" {
 struct TRI_json_s;
-}
 
 namespace triagens {
   namespace rest {

lib/Scheduler/TimerTask.h

@@ -32,9 +32,7 @@
 #include "Basics/Common.h"
 #include "Scheduler/Task.h"
 
-extern "C" {
 struct TRI_json_s;
-}
 
 namespace triagens {
   namespace rest {

lib/Utilities/LinenoiseShell.cpp

@@ -29,16 +29,10 @@
 #include "Utilities/Completer.h"
 #include "Utilities/LineEditor.h"
 
-#include "V8/v8-utils.h"
-
 extern "C" {
 #include <linenoise.h>
 }
 
-#include <vector>
-#include <string>
-
-#include "BasicsC/tri-strings.h"
 #include "BasicsC/files.h"
 
 using namespace std;