Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Jan Steemann 2014-05-22 10:52:23 +02:00
parent cf099a629b 2820afdcc2
commit 01a4c43b81
26 changed files with 30 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Actions/actions.h
View File

@ -35,7 +35,7 @@
// --SECTION-- forward declarations
// -----------------------------------------------------------------------------
extern "C" struct TRI_vocbase_s;
struct TRI_vocbase_s;
namespace triagens {
namespace rest {

4
arangod/Cluster/ApplicationCluster.h
View File

@ -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 {

8
arangod/Cluster/ClusterInfo.h
View File

@ -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 {

6
arangod/Cluster/ClusterMethods.h
View File

@ -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 {

4
arangod/Cluster/HeartbeatThread.h
View File

@ -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 {

4
arangod/Cluster/ServerJob.h
View File

@ -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

8
arangod/FulltextIndex/fulltext-handles.h
View File

@ -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:

8
arangod/FulltextIndex/fulltext-list.h
View File

@ -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:

8
arangod/FulltextIndex/fulltext-result.h
View File

@ -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:

9
arangod/IndexOperators/index-operator.h
View File

@ -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:

10
arangod/RestHandler/RestVocbaseBaseHandler.h
View File

@ -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

6
arangod/RestServer/ArangoServer.h
View File

@ -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

4
arangod/RestServer/ConsoleThread.h
View File

@ -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 {

6
arangod/RestServer/VocbaseContext.h
View File

@ -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

6
arangod/V8Server/ApplicationV8.h
View File

@ -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 {

4
arangod/V8Server/V8Job.h
View File

@ -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

4
arangod/V8Server/V8PeriodicTask.h
View File

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

4
arangod/V8Server/V8TimerTask.h
View File

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

6
arangod/V8Server/v8-vocbase.h
View File

@ -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 {

4
arangod/Wal/Slot.h
View File

@ -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 {

2
arangoirb/MRClient/MRubyClientConnection.cpp
View File

@ -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;

4
lib/Scheduler/PeriodicTask.h
View File

@ -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 {

4
lib/Scheduler/Scheduler.h
View File

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

4
lib/Scheduler/Task.h
View File

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

4
lib/Scheduler/TimerTask.h
View File

@ -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 {

6
lib/Utilities/LinenoiseShell.cpp
View File

@ -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;