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

finalized move to cxx

This commit is contained in:
Jan Steemann 2014-09-14 00:06:00 +02:00
parent f5c3ee89c7
commit 4e6f6f2cbd
61 changed files with 608 additions and 1058 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
config/generateErrorfile.py Normal file → Executable file
View File

@ -20,18 +20,12 @@ def wrap(string, width=80, ind1=0, ind2=0, prefix=''):
# generate javascript file from errors
def genJsFile(errors):
jslint = "/*jslint indent: 2,\n"\
" nomen: true,\n"\
" maxlen: 240,\n"\
" sloppy: true,\n"\
" vars: true,\n"\
" white: true,\n"\
" plusplus: true */\n"\
"/*global require */\n\n"
jslint = "/*jshint maxlen: 240 */\n/*global require */\n\n"
out = jslint \
+ prologue\
+ "(function () {\n"\
+ " \"use strict\";\n"\
+ " var internal = require(\"internal\");\n"\
+ "\n"\
+ " internal.errors = {\n"
@ -103,10 +97,6 @@ def genCHeaderFile(errors):
+ "#ifndef TRIAGENS_BASICS_C_VOC_ERRORS_H\n"\
+ "#define TRIAGENS_BASICS_C_VOC_ERRORS_H 1\n"\
+ "\n"\
+ "#ifdef __cplusplus\n"\
+ "extern \"C\" {\n"\
+ "#endif\n"\
+ "\n"\
+ wiki\
+ "\n"\
+ "////////////////////////////////////////////////////////////////////////////////\n"\
@ -137,10 +127,6 @@ def genCHeaderFile(errors):
+ "\n"
header = header\
+ "#ifdef __cplusplus\n"\
+ "}\n"\
+ "#endif\n"\
+ "\n"\
+ "#endif\n"\
+ "\n"
@ -190,7 +176,7 @@ if extension == ".js":
out = genJsFile(errorsList)
elif extension == ".h":
out = genCHeaderFile(errorsList)
elif extension == ".c":
elif extension == ".cpp":
out = genCFile(errorsList, filename)
else:
print >> sys.stderr, "usage: %s <sourcefile> <outfile>" % sys.argv[0]

10
config/generateMimetypes.py Normal file → Executable file
View File

@ -78,19 +78,11 @@ def genCHeaderFile(types):
+ "#ifndef TRIAGENS_BASICS_C_VOC_MIMETYPES_H\n"\
+ "#define TRIAGENS_BASICS_C_VOC_MIMETYPES_H 1\n"\
+ "\n"\
+ "#ifdef __cplusplus\n"\
+ "extern \"C\" {\n"\
+ "#endif\n"\
+ "\n"\
+ "////////////////////////////////////////////////////////////////////////////////\n"\
+ "/// @brief initialise mimetypes\n"\
+ "////////////////////////////////////////////////////////////////////////////////\n"\
+ "\n"\
+ "void TRI_InitialiseEntriesMimetypes (void);\n"\
+ "#ifdef __cplusplus\n"\
+ "}\n"\
+ "#endif\n"\
+ "\n"\
+ "#endif\n"\
+ "\n"
@ -165,7 +157,7 @@ if extension == ".js":
out = genJsFile(types)
elif extension == ".h":
out = genCHeaderFile(types)
elif extension == ".c":
elif extension == ".cpp":
out = genCFile(types, filename)
else:
print >> sys.stderr, "usage: %s <sourcefile> <outfile>" % sys.argv[0]

4
js/apps/system/aardvark/frontend/js/bootstrap/errors.js
View File

@ -1,4 +1,4 @@
/*jshint maxlen: 200 */
/*jshint maxlen: 240 */
/*global require */
////////////////////////////////////////////////////////////////////////////////
@ -155,7 +155,7 @@
"ERROR_QUERY_TOO_MANY_COLLECTIONS" : { "code" : 1522, "message" : "too many collections" },
"ERROR_QUERY_DOCUMENT_ATTRIBUTE_REDECLARED" : { "code" : 1530, "message" : "document attribute '%s' is assigned multiple times" },
"ERROR_QUERY_FUNCTION_NAME_UNKNOWN" : { "code" : 1540, "message" : "usage of unknown function '%s()'" },
"ERROR_QUERY_FUNCTION_ARGUMENT_NUMBER_MISMATCH" : { "code" : 1541, "message" : "invalid number of arguments for function '%s()'" },
"ERROR_QUERY_FUNCTION_ARGUMENT_NUMBER_MISMATCH" : { "code" : 1541, "message" : "invalid number of arguments for function '%s()', expected number of arguments: minimum: %d, maximum: %d" },
"ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH" : { "code" : 1542, "message" : "invalid argument type used in call to function '%s()'" },
"ERROR_QUERY_INVALID_REGEX" : { "code" : 1543, "message" : "invalid regex argument value used in call to function '%s()'" },
"ERROR_QUERY_BIND_PARAMETERS_INVALID" : { "code" : 1550, "message" : "invalid structure of bind parameters" },

7
js/apps/system/aardvark/frontend/js/modules/org/arangodb/mimetypes.js
View File

@ -1,4 +1,11 @@
module.define("org/arangodb/mimetypes", function(exports, module) {
/*jslint indent: 2,
nomen: true,
maxlen: 100,
sloppy: true,
vars: true,
white: true,
plusplus: true */
/*global exports */
////////////////////////////////////////////////////////////////////////////////

4
js/common/bootstrap/errors.js
View File

@ -1,4 +1,4 @@
/*jshint maxlen: 200 */
/*jshint maxlen: 240 */
/*global require */
////////////////////////////////////////////////////////////////////////////////
@ -155,7 +155,7 @@
"ERROR_QUERY_TOO_MANY_COLLECTIONS" : { "code" : 1522, "message" : "too many collections" },
"ERROR_QUERY_DOCUMENT_ATTRIBUTE_REDECLARED" : { "code" : 1530, "message" : "document attribute '%s' is assigned multiple times" },
"ERROR_QUERY_FUNCTION_NAME_UNKNOWN" : { "code" : 1540, "message" : "usage of unknown function '%s()'" },
"ERROR_QUERY_FUNCTION_ARGUMENT_NUMBER_MISMATCH" : { "code" : 1541, "message" : "invalid number of arguments for function '%s()'" },
"ERROR_QUERY_FUNCTION_ARGUMENT_NUMBER_MISMATCH" : { "code" : 1541, "message" : "invalid number of arguments for function '%s()', expected number of arguments: minimum: %d, maximum: %d" },
"ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH" : { "code" : 1542, "message" : "invalid argument type used in call to function '%s()'" },
"ERROR_QUERY_INVALID_REGEX" : { "code" : 1543, "message" : "invalid regex argument value used in call to function '%s()'" },
"ERROR_QUERY_BIND_PARAMETERS_INVALID" : { "code" : 1550, "message" : "invalid structure of bind parameters" },

7
js/common/modules/org/arangodb/mimetypes.js
View File

@ -1,3 +1,10 @@
/*jslint indent: 2,
nomen: true,
maxlen: 100,
sloppy: true,
vars: true,
white: true,
plusplus: true */
/*global exports */
////////////////////////////////////////////////////////////////////////////////

62
lib/Basics/Common.h
View File

@ -137,6 +137,29 @@ typedef long suseconds_t;
#include "Basics/system-functions.h"
#undef TRI_WITHIN_COMMON
// -----------------------------------------------------------------------------
// --SECTION-- C++ header files that are always present on all systems
// -----------------------------------------------------------------------------
#include <algorithm>
#include <deque>
#include <iostream>
#include <list>
#include <map>
#include <queue>
#include <set>
#include <sstream>
#include <fstream>
#include <stack>
#include <string>
#include <vector>
// C++11!!
#include <unordered_map>
#include <unordered_set>
#include <memory>
#include <atomic>
// -----------------------------------------------------------------------------
// --SECTION-- low level helpers
// -----------------------------------------------------------------------------
@ -185,10 +208,7 @@ static inline uint64_t TRI_DecModU64 (uint64_t i, uint64_t len) {
#endif
////////////////////////////////////////////////////////////////////////////////
/// @brief a wrapper for assert()
///
/// This wrapper maps TRI_ASSERT() to (void) 0 for non-maintainers.
/// It maps TRI_ASSERT() to assert() when TRI_ENABLE_MAINTAINER_MODE is set
/// @brief backtrace functionality
////////////////////////////////////////////////////////////////////////////////
#ifdef TRI_ENABLE_MAINTAINER_MODE
@ -197,10 +217,8 @@ static inline uint64_t TRI_DecModU64 (uint64_t i, uint64_t len) {
#include <execinfo.h>
#ifdef __cplusplus
#define TRI_USE_DEMANGLING
#include <cxxabi.h>
#endif
#endif
static inline void _backtrace (void) {
@ -264,9 +282,6 @@ static inline void _backtrace (void) {
#endif
}
#ifdef __cplusplus
#include <string>
#include <sstream>
static inline void _getBacktrace (std::string& btstr) {
#if HAVE_BACKTRACE
void* stack_frames[50];
@ -337,7 +352,6 @@ static inline void _getBacktrace (std::string& btstr) {
}
#endif
}
#endif
#ifndef TRI_ASSERT
#define TRI_ASSERT(expr) { if (!(expr)) _backtrace(); assert(expr);}
@ -347,13 +361,8 @@ static inline void _getBacktrace (std::string& btstr) {
#else
#ifndef TRI_ASSERT
#if defined __cplusplus
#define TRI_ASSERT(expr) (static_cast<void>(0))
#define TRI_ASSERT_EXPENSIVE(expr) (static_cast<void>(0))
#else
#define TRI_ASSERT(expr) ((void) (0))
#define TRI_ASSERT_EXPENSIVE(expr) ((void) (0))
#endif
#endif
#endif
@ -362,29 +371,6 @@ static inline void _getBacktrace (std::string& btstr) {
#include "Basics/win-utils.h"
#endif
// -----------------------------------------------------------------------------
// --SECTION-- C++ header files that are always present on all systems
// -----------------------------------------------------------------------------
#include <algorithm>
#include <deque>
#include <iostream>
#include <list>
#include <map>
#include <queue>
#include <set>
#include <sstream>
#include <fstream>
#include <stack>
#include <string>
#include <vector>
// C++11!!
#include <unordered_map>
#include <unordered_set>
#include <memory>
#include <atomic>
// -----------------------------------------------------------------------------
// --SECTIONS-- triagens namespace
// -----------------------------------------------------------------------------

8
lib/Basics/Utf8Helper.cpp
View File

@ -489,10 +489,6 @@ TRI_vector_string_t* Utf8Helper::getWords (const char* const text,
return words;
}
#ifdef __cplusplus
extern "C" {
#endif
////////////////////////////////////////////////////////////////////////////////
/// @brief compare two utf16 strings
////////////////////////////////////////////////////////////////////////////////
@ -537,10 +533,6 @@ TRI_vector_string_t* TRI_get_words (const char* const text,
return Utf8Helper::DefaultUtf8Helper.getWords(text, textLength, minimalWordLength, maximalWordLength, lowerCase);
}
#ifdef __cplusplus
}
#endif
// -----------------------------------------------------------------------------
// --SECTION-- END-OF-FILE
// -----------------------------------------------------------------------------

10
lib/Basics/application-exit.h
View File

@ -31,11 +31,7 @@
#define ARANGODB_BASICS_C_APPLICATION__EXIT_H 1
#ifndef TRI_WITHIN_COMMON
#error use <BasicsC/common.h>
#endif
#ifdef __cplusplus
extern "C" {
#error use <Basics/Common.h>
#endif
// -----------------------------------------------------------------------------
@ -60,10 +56,6 @@ extern TRI_ExitFunction_t TRI_EXIT_FUNCTION;
void TRI_Application_Exit_SetExit (TRI_ExitFunction_t);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

8
lib/Basics/associative-multi.h
View File

@ -38,10 +38,6 @@
#include "Basics/locks.h"
#include "Basics/vector.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- MULTI ASSOCIATIVE POINTERS
// -----------------------------------------------------------------------------
@ -398,10 +394,6 @@ void* TRI_RemovePairMultiPair (TRI_multi_pair_t*,
int TRI_ResizeMultiPair (TRI_multi_pair_t*, size_t);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

8
lib/Basics/associative.h
View File

@ -35,10 +35,6 @@
#include "Basics/locks.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- ASSOCIATIVE ARRAY
// -----------------------------------------------------------------------------
@ -447,10 +443,6 @@ void* TRI_RemoveKeyAssociativeSynced (TRI_associative_synced_t*,
size_t TRI_GetLengthAssociativeSynced (TRI_associative_synced_t* const);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

8
lib/Basics/conversions.h
View File

@ -32,10 +32,6 @@
#include "Basics/Common.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- public functions for string to something
// -----------------------------------------------------------------------------
@ -320,10 +316,6 @@ char* TRI_StringUInt32Octal (uint32_t);
char* TRI_StringUInt64Octal (uint64_t);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

8
lib/Basics/csv.h
View File

@ -32,10 +32,6 @@
#include "Basics/Common.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- public types
// -----------------------------------------------------------------------------
@ -152,10 +148,6 @@ int TRI_ParseCsvString (TRI_csv_parser_t*, char const*);
int TRI_ParseCsvString2 (TRI_csv_parser_t*, char const*, size_t);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

10
lib/Basics/debugging.h
View File

@ -31,11 +31,7 @@
#define ARANGODB_BASICS_C_DEBUGGING_H 1
#ifndef TRI_WITHIN_COMMON
#error use <BasicsC/common.h>
#endif
#ifdef __cplusplus
extern "C" {
#error use <Basics/Common.h>
#endif
// -----------------------------------------------------------------------------
@ -147,10 +143,6 @@ void TRI_InitialiseDebugging (void);
void TRI_ShutdownDebugging (void);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

10
lib/Basics/error.h
View File

@ -31,11 +31,7 @@
#define ARANGODB_BASICS_C_ERROR_H 1
#ifndef TRI_WITHIN_COMMON
#error use <BasicsC/common.h>
#endif
#ifdef __cplusplus
extern "C" {
#error use <Basics/Common.h>
#endif
// -----------------------------------------------------------------------------
@ -106,10 +102,6 @@ void TRI_InitialiseError (void);
void TRI_ShutdownError (void);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

8
lib/Basics/fasthash.h
View File

@ -28,10 +28,6 @@
#include "Basics/Common.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* fasthash32 - 32-bit implementation of fasthash
* @buf: data buffer
@ -48,10 +44,6 @@ uint32_t fasthash32(const void *buf, size_t len, uint32_t seed);
*/
uint64_t fasthash64(const void *buf, size_t len, uint64_t seed);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------
// --SECTION-- END-OF-FILE

8
lib/Basics/files.h
View File

@ -38,10 +38,6 @@
#include "Basics/socket-utils.h"
#include "Basics/vector.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- public functions
// -----------------------------------------------------------------------------
@ -320,10 +316,6 @@ void TRI_InitialiseFiles (void);
void TRI_ShutdownFiles (void);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

8
lib/Basics/hashes.h
View File

@ -32,10 +32,6 @@
#include "Basics/Common.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- (FNV-1a Fowler–Noll–Vo hash function) FNV
// -----------------------------------------------------------------------------
@ -144,10 +140,6 @@ void TRI_InitialiseHashes (void);
void TRI_ShutdownHashes (void);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

8
lib/Basics/json.h
View File

@ -35,10 +35,6 @@
#include "Basics/associative.h"
#include "Basics/vector.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- forward declarations
// -----------------------------------------------------------------------------
@ -415,10 +411,6 @@ TRI_json_t* TRI_JsonFile (TRI_memory_zone_t*, char const* path, char** error);
bool TRI_EqualJsonJson (TRI_json_t*, TRI_json_t*);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

8
lib/Basics/linked-list.h
View File

@ -34,10 +34,6 @@
#include "Basics/associative.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- LINKED LIST
// -----------------------------------------------------------------------------
@ -171,10 +167,6 @@ void TRI_MoveToBackLinkedArray (TRI_linked_array_t* array, void const* data);
void const* TRI_PopFrontLinkedArray (TRI_linked_array_t* array);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

4
lib/Basics/local-configuration-win.h
View File

@ -1,4 +1,4 @@
/* lib/BasicsC/local-configuration.h. Generated from local-configuration.h.in by configure. */
/* lib/Basics/local-configuration.h. Generated from local-configuration.h.in by configure. */
////////////////////////////////////////////////////////////////////////////////
/// @brief High-Performance Database Framework made by triagens
///
@ -32,7 +32,7 @@
#define ARANGODB_BASICS_C_LOCAL__CONFIGURATION__WIN_H 1
#ifndef TRI_WITHIN_COMMON
#error use <BasicsC/common.h>
#error use <Basics/Common.h>
#endif
// -----------------------------------------------------------------------------

2
lib/Basics/local-configuration.h.in
View File

@ -29,7 +29,7 @@
#define TRIAGENS_BASICS_CONFIGURATION_H 1
#ifndef TRI_WITHIN_COMMON
#error use <BasicsC/common.h>
#error use <Basics/Common.h>
#endif
// -----------------------------------------------------------------------------

8
lib/Basics/locks-macos.h
View File

@ -36,10 +36,6 @@
#include <libkern/OSAtomic.h>
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- public types
// -----------------------------------------------------------------------------
@ -58,10 +54,6 @@ extern "C" {
#endif
#ifdef __cplusplus
}
#endif
#endif
#endif

8
lib/Basics/locks-posix.h
View File

@ -36,10 +36,6 @@
#include <pthread.h>
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- public types
// -----------------------------------------------------------------------------
@ -82,10 +78,6 @@ typedef struct TRI_condition_s {
}
TRI_condition_t;
#ifdef __cplusplus
}
#endif
#endif
#endif

8
lib/Basics/locks-win32.h
View File

@ -34,10 +34,6 @@
#ifdef TRI_HAVE_WIN32_THREADS
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- public types
// -----------------------------------------------------------------------------
@ -93,10 +89,6 @@ typedef struct TRI_condition_s {
}
TRI_condition_t;
#ifdef __cplusplus
}
#endif
#endif
#endif

8
lib/Basics/locks.h
View File

@ -60,10 +60,6 @@
#include "Basics/locks-macos.h"
#endif
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- MUTEX
// -----------------------------------------------------------------------------
@ -304,10 +300,6 @@ void TRI_LockCondition (TRI_condition_t* cond);
void TRI_UnlockCondition (TRI_condition_t* cond);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

8
lib/Basics/logging.h
View File

@ -34,10 +34,6 @@
#include "Basics/vector.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- LOGGING
// -----------------------------------------------------------------------------
@ -526,10 +522,6 @@ bool TRI_ShutdownLogging (bool);
void TRI_ReopenLogging (void);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

8
lib/Basics/memory-map-posix.h
View File

@ -36,10 +36,6 @@
#include <sys/mman.h>
#ifdef __cplusplus
extern "C" {
#endif
////////////////////////////////////////////////////////////////////////////////
/// @brief create a wrapper for MAP_ANONYMOUS / MAP_ANON
///
@ -53,10 +49,6 @@ extern "C" {
#define TRI_MMAP_ANONYMOUS MAP_ANON
#endif
#ifdef __cplusplus
}
#endif
#endif
#endif

10
lib/Basics/memory-map-win32.h
View File

@ -75,16 +75,6 @@
#define PROT_GROWSDOWN 0x01000000 /* Extend change to start of growsdown vma (mprotect only). */
#define PROT_GROWSUP 0x02000000 /* Extend change to start of growsup vma (mprotect only). */
#ifdef __cplusplus
extern "C" {
#endif
#ifdef __cplusplus
}
#endif
#endif
#endif

8
lib/Basics/memory-map.h
View File

@ -58,10 +58,6 @@
#include "Basics/memory-map-win32.h"
#endif
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- THREAD
// -----------------------------------------------------------------------------
@ -115,10 +111,6 @@ int TRI_ProtectMMFile (void* memoryAddress,
int fileDescriptor,
void** mmHandle);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

10
lib/Basics/memory.h
View File

@ -31,11 +31,7 @@
#define ARANGODB_BASICS_C_MEMORY_H 1
#ifndef TRI_WITHIN_COMMON
#error use <BasicsC/common.h>
#endif
#ifdef __cplusplus
extern "C" {
#error use <Basics/Common.h>
#endif
// -----------------------------------------------------------------------------
@ -179,10 +175,6 @@ void TRI_InitialiseMemory (void);
void TRI_ShutdownMemory (void);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

8
lib/Basics/messages.h
View File

@ -31,10 +31,6 @@
#ifndef ARANGODB_BASICS_C_MESSAGES_H
#define ARANGODB_BASICS_C_MESSAGES_H 1
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- public defines
// -----------------------------------------------------------------------------
@ -72,10 +68,6 @@ extern "C" {
TRI_BYE_MESSAGE_JP " " \
TRI_BYE_MESSAGE_RU
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

10
lib/Basics/mimetypes.h
View File

@ -31,11 +31,7 @@
#define ARANGODB_BASICS_C_MIMETYPES_H 1
#ifndef TRI_WITHIN_COMMON
#error use <BasicsC/common.h>
#endif
#ifdef __cplusplus
extern "C" {
#error use <Basics/Common.h>
#endif
// -----------------------------------------------------------------------------
@ -78,10 +74,6 @@ void TRI_InitialiseMimetypes (void);
void TRI_ShutdownMimetypes (void);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

7
lib/Basics/operating-system.h
View File

@ -31,7 +31,7 @@
#define ARANGODB_BASICS_C_OPERATING__SYSTEM_H 1
#ifndef TRI_WITHIN_COMMON
#error use <BasicsC/common.h>
#error use <Basics/Common.h>
#endif
// -----------------------------------------------------------------------------
@ -387,11 +387,6 @@
#define __USE_BSD
#endif
// for pthread_sigmask
#ifndef __cplusplus
#define __USE_UNIX98
#endif
////////////////////////////////////////////////////////////////////////////////
/// @brief enabled features
////////////////////////////////////////////////////////////////////////////////

8
lib/Basics/prime-numbers.h
View File

@ -32,10 +32,6 @@
#include "Basics/Common.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- public functions
// -----------------------------------------------------------------------------
@ -46,10 +42,6 @@ extern "C" {
uint64_t TRI_NearPrime (uint64_t);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

8
lib/Basics/process-utils.h
View File

@ -34,10 +34,6 @@
#include "Basics/threads.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- public constants
// -----------------------------------------------------------------------------
@ -225,10 +221,6 @@ void TRI_InitialiseProcess (int argc, char* argv[]);
void TRI_ShutdownProcess (void);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

8
lib/Basics/random.h
View File

@ -32,10 +32,6 @@
#include "Basics/Common.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- public functions
// -----------------------------------------------------------------------------
@ -72,10 +68,6 @@ void TRI_InitialiseRandom (void);
void TRI_ShutdownRandom (void);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

8
lib/Basics/shell-colors.h
View File

@ -30,10 +30,6 @@
#ifndef ARANGODB_BASICS_C_SHELL__COLORS_H
#define ARANGODB_BASICS_C_SHELL__COLORS_H 1
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- public constants
// -----------------------------------------------------------------------------
@ -181,10 +177,6 @@ extern "C" {
#endif
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

8
lib/Basics/skip-list.h
View File

@ -32,10 +32,6 @@
#include "Basics/Common.h"
#ifdef __cplusplus
extern "C" {
#endif
// We will probably never see more than 2^48 documents in a skip list
#define TRI_SKIPLIST_MAX_HEIGHT 48
@ -229,10 +225,6 @@ TRI_skiplist_node_t* TRI_SkipListLeftKeyLookup (TRI_skiplist_t *sl, void *key);
TRI_skiplist_node_t* TRI_SkipListRightKeyLookup (TRI_skiplist_t *sl, void *key);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

8
lib/Basics/socket-utils.h
View File

@ -47,10 +47,6 @@
#include <WS2tcpip.h>
#endif
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- public constants
// -----------------------------------------------------------------------------
@ -304,10 +300,6 @@ void TRI_InitialiseSockets (void);
void TRI_ShutdownSockets (void);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

8
lib/Basics/string-buffer.h
View File

@ -32,10 +32,6 @@
#include "Basics/Common.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- public types
// -----------------------------------------------------------------------------
@ -480,10 +476,6 @@ int TRI_AppendCsvUInt64StringBuffer (TRI_string_buffer_t * self, uint64_t i);
int TRI_AppendCsvDoubleStringBuffer (TRI_string_buffer_t * self, double d);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

10
lib/Basics/structures.h
View File

@ -31,11 +31,7 @@
#define ARANGODB_BASICS_C_STRUCTURES_H 1
#ifndef TRI_WITHIN_COMMON
#error use <BasicsC/common.h>
#endif
#ifdef __cplusplus
extern "C" {
#error use <Basics/Common.h>
#endif
// -----------------------------------------------------------------------------
@ -125,10 +121,6 @@ int TRI_CopyToBlob (TRI_memory_zone_t*, TRI_blob_t* dst, TRI_blob_t const* src);
int TRI_AssignToBlob (TRI_memory_zone_t* zone, TRI_blob_t* dst, TRI_blob_t const* src);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

10
lib/Basics/system-compiler.h
View File

@ -31,11 +31,7 @@
#define ARANGODB_BASICS_C_SYSTEM__COMPILER_H 1
#ifndef TRI_WITHIN_COMMON
#error use <BasicsC/common.h>
#endif
#ifdef __cplusplus
extern "C" {
#error use <Basics/Common.h>
#endif
// -----------------------------------------------------------------------------
@ -114,10 +110,6 @@ extern "C" {
#define PW(a) /* prefetch write */
#endif
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

10
lib/Basics/system-functions.h
View File

@ -31,11 +31,7 @@
#define ARANGODB_BASICS_C_SYSTEM__FUNCTIONS_H 1
#ifndef TRI_WITHIN_COMMON
#error use <BasicsC/common.h>
#endif
#ifdef __cplusplus
extern "C" {
#error use <Basics/Common.h>
#endif
// -----------------------------------------------------------------------------
@ -78,10 +74,6 @@ void TRI_gmtime (time_t, struct tm*);
double TRI_microtime (void);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

8
lib/Basics/terminal-utils.h
View File

@ -36,10 +36,6 @@
#include <termios.h>
#endif
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- public constants
// -----------------------------------------------------------------------------
@ -66,10 +62,6 @@ int TRI_ColumnsWidth (void);
void TRI_SetStdinVisibility (bool);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

8
lib/Basics/threads-posix.h
View File

@ -36,10 +36,6 @@
#include <pthread.h>
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- THREAD
// -----------------------------------------------------------------------------
@ -72,10 +68,6 @@ extern "C" {
#define TRI_thread_t pthread_t
#ifdef __cplusplus
}
#endif
#endif
#endif

8
lib/Basics/threads-win32.h
View File

@ -32,10 +32,6 @@
#include "Basics/Common.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- THREAD
// -----------------------------------------------------------------------------
@ -68,10 +64,6 @@ extern "C" {
#define TRI_thread_t HANDLE
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

8
lib/Basics/threads.h
View File

@ -48,10 +48,6 @@
#include "Basics/threads-win32.h"
#endif
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- THREAD
// -----------------------------------------------------------------------------
@ -130,10 +126,6 @@ bool TRI_IsSelfThread (TRI_thread_t* thread);
void TRI_AllowCancelation (void);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

8
lib/Basics/tri-strings.h
View File

@ -34,10 +34,6 @@
#include "Basics/vector.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- public functions
// -----------------------------------------------------------------------------
@ -352,10 +348,6 @@ char* TRI_PrefixUtf8String (const char*, const uint32_t);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

8
lib/Basics/utf8-helper.h
View File

@ -35,10 +35,6 @@
#include "unicode/ustring.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- public functions
// -----------------------------------------------------------------------------
@ -122,10 +118,6 @@ TRI_vector_string_t* TRI_get_words (const char* const text,
const size_t maximalWordLength,
bool lowerCase);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

8
lib/Basics/vector.h
View File

@ -32,10 +32,6 @@
#include "Basics/Common.h"
#ifdef __cplusplus
extern "C" {
#endif
// -----------------------------------------------------------------------------
// --SECTION-- POD VECTORS
// -----------------------------------------------------------------------------
@ -441,10 +437,6 @@ void TRI_RemoveVectorString (TRI_vector_string_t*, size_t n);
char* TRI_AtVectorString (TRI_vector_string_t const*, size_t);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

3
lib/Basics/voc-errors.cpp
View File

@ -3,7 +3,7 @@
////////////////////////////////////////////////////////////////////////////////
#include <Basics/Common.h>
#include "Basics/voc-errors.h"
#include "./lib/Basics/voc-errors.h"
void TRI_InitialiseErrorMessages (void) {
REG_ERROR(ERROR_NO_ERROR, "no error");
@ -248,4 +248,3 @@ void TRI_InitialiseErrorMessages (void) {
REG_ERROR(ERROR_QUEUE_UNKNOWN, "named queue does not exist");
REG_ERROR(ERROR_QUEUE_FULL, "named queue is full");
}

27
lib/Basics/voc-errors.h
View File

@ -2,13 +2,9 @@
#ifndef TRIAGENS_BASICS_C_VOC_ERRORS_H
#define TRIAGENS_BASICS_C_VOC_ERRORS_H 1
#ifdef __cplusplus
extern "C" {
#endif
////////////////////////////////////////////////////////////////////////////////
/// @page ArangoErrors Error codes and meanings
/// @startDocuBlock errorCodes
///
/// The following errors might be raised when running ArangoDB:
///
/// - 0: @LIT{no error}
@ -587,19 +583,13 @@ extern "C" {
/// - 20000: @LIT{newest version of app already installed}
/// newest version of app already installed
/// - 21000: @LIT{named queue already exists}
/// Will be returned if a queue with this name already exists.
/// "Will be returned if a queue with this name already exists."
/// - 21001: @LIT{dispatcher stopped}
/// Will be returned if a shutdown is in progress.
/// - 21002: @LIT{named queue does not exist}
/// Will be returned if a queue with this name does not exist.
/// "Will be returned if a queue with this name does not exist."
/// - 21003: @LIT{named queue is full}
/// Will be returned if a queue with this name is full.
/// @endDocuBlock
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
/// @addtogroup VocError
/// @{
/// "Will be returned if a queue with this name is full."
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@ -3118,14 +3108,5 @@ void TRI_InitialiseErrorMessages (void);
#define TRI_ERROR_QUEUE_FULL (21003)
////////////////////////////////////////////////////////////////////////////////
/// @}
////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
#endif

13
lib/Basics/voc-mimetypes.cpp
View File

@ -2,8 +2,8 @@
/// @brief auto-generated file generated from mimetypes.dat
////////////////////////////////////////////////////////////////////////////////
#include "Basics/Common.h"
#include "Basics/voc-mimetypes.h"
#include <Basics/Common.h>
#include "./lib/Basics/voc-mimetypes.h"
////////////////////////////////////////////////////////////////////////////////
/// @brief initialise mimetypes
@ -29,12 +29,3 @@ void TRI_InitialiseEntriesMimetypes (void) {
TRI_RegisterMimetype("woff", "application/font-woff", false);
TRI_RegisterMimetype("eot", "application/vnd.ms-fontobject", false);
}
// -----------------------------------------------------------------------------
// --SECTION-- END-OF-FILE
// -----------------------------------------------------------------------------
// Local Variables:
// mode: outline-minor
// outline-regexp: "/// @brief\\|/// {@inheritDoc}\\|/// @page\\|// --SECTION--\\|/// @\\}"
// End:

17
lib/Basics/voc-mimetypes.h
View File

@ -2,27 +2,10 @@
#ifndef TRIAGENS_BASICS_C_VOC_MIMETYPES_H
#define TRIAGENS_BASICS_C_VOC_MIMETYPES_H 1
#ifdef __cplusplus
extern "C" {
#endif
////////////////////////////////////////////////////////////////////////////////
/// @brief initialise mimetypes
////////////////////////////////////////////////////////////////////////////////
void TRI_InitialiseEntriesMimetypes (void);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------
// --SECTION-- END-OF-FILE
// -----------------------------------------------------------------------------
// Local Variables:
// mode: outline-minor
// outline-regexp: "/// @brief\\|/// {@inheritDoc}\\|/// @page\\|// --SECTION--\\|/// @\\}"
// End:

8
lib/Basics/win-utils.h
View File

@ -32,10 +32,6 @@
#include <WinSock2.h>
#ifdef __cplusplus
extern "C" {
#endif
// .............................................................................
// Called before anything else starts - initialises whatever is required to be
// initalised.
@ -99,10 +95,6 @@ void TRI_sleep (unsigned long);
void TRI_usleep (unsigned long);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

10
lib/Basics/xxhash.h
View File

@ -59,11 +59,6 @@ It depends on successfully passing SMHasher test set.
#pragma once
#if defined (__cplusplus)
extern "C" {
#endif
//****************************
// Type
//****************************
@ -157,11 +152,6 @@ To free memory context, use XXH32_digest(), or free().
#define XXH32_result XXH32_digest
#define XXH32_getIntermediateResult XXH32_intermediateDigest
#if defined (__cplusplus)
}
#endif
// -----------------------------------------------------------------------------
// --SECTION-- END-OF-FILE
// -----------------------------------------------------------------------------

9
lib/JsonParser/json-parser.cpp
View File

@ -2384,9 +2384,6 @@ 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;
YY_BUFFER_STATE buf;
@ -2449,9 +2446,6 @@ 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);
}
@ -2460,9 +2454,6 @@ 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;
TRI_json_t* object;

9
lib/JsonParser/json-parser.ll
View File

@ -474,9 +474,6 @@ 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;
YY_BUFFER_STATE buf;
@ -539,9 +536,6 @@ 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);
}
@ -550,9 +544,6 @@ 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;
TRI_json_t* object;

8
lib/MRuby/mr-utils.h
View File

@ -34,10 +34,6 @@
#include "Basics/json.h"
#ifdef __cplusplus
extern "C" {
#endif
#include "mruby.h"
// -----------------------------------------------------------------------------
@ -130,10 +126,6 @@ bool TRI_ExecuteRubyString (mrb_state*,
void TRI_InitMRUtils (mrb_state* mrb);
#ifdef __cplusplus
}
#endif
#endif
// -----------------------------------------------------------------------------

3
lib/ShapedJson/json-shaper.h
View File

@ -31,9 +31,6 @@
#ifndef ARANGODB_SHAPED_JSON_JSON__SHAPER_H
#define ARANGODB_SHAPED_JSON_JSON__SHAPER_H 1
// Note that this file is included in lib/BasicsC/init.c and thus must
// use C linkage.
#include "Basics/Common.h"
#include "Basics/json.h"