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

Merge branch 'devel' into vpack

This commit is contained in:
Max Neunhoeffer 2015-12-23 15:14:05 +01:00
parent 394057fbda b4887dce17
commit 2dbdb52a36
2 changed files with 0 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
lib/Basics/StringUtils.cpp
View File

@ -37,15 +37,6 @@
#include "Basics/Exceptions.h" #include "Basics/Exceptions.h"
#include "Basics/StringBuffer.h" #include "Basics/StringBuffer.h"
// TODO need to do this in another way
#ifndef TRI_HAVE_GLOBAL_TIMEZONE_PROTO
#ifdef GLOBAL_TIMEZONE
extern long GLOBAL_TIMEZONE;
#else
static long GLOBAL_TIMEZONE = 0;
#endif
#endif
using namespace std; using namespace std;
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@ -57,57 +48,16 @@ namespace {
return a == ' ' || a == '\t' || a == '_'; return a == ' ' || a == '\t' || a == '_';
} }
int32_t matchInteger (char const * & str, size_t size) {
int32_t result = 0;
for (size_t i = 0; i < size; i++, str++) {
if ('0' <= *str && *str <= '9') {
result = result * 10 + (*str - '0');
}
else {
std::string message("cannot parse date, expecting integer, got '" + string(1, *str) + "'");
THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_BAD_PARAMETER, message);
}
}
return result;
}
int32_t matchInteger (char const * & str) {
int32_t result = 0;
for (; *str; str++) {
if ('0' <= *str && *str <= '9') {
result = result * 10 + (*str - '0');
}
else {
return result;
}
}
return result;
}
char const * const BASE64_CHARS = char const * const BASE64_CHARS =
"ABCDEFGHIJKLMNOPQRSTUVWXYZ" "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz" "abcdefghijklmnopqrstuvwxyz"
"0123456789+/"; "0123456789+/";
char const * const BASE64U_CHARS = char const * const BASE64U_CHARS =
"ABCDEFGHIJKLMNOPQRSTUVWXYZ" "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz" "abcdefghijklmnopqrstuvwxyz"
"0123456789-_"; "0123456789-_";
unsigned char const BASE64_REVS[256] = { unsigned char const BASE64_REVS[256] = {
'\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', // 0 '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', // 0
'\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', // 16 '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', // 16

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

@ -116,8 +116,6 @@
/// @brief available features /// @brief available features
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#define GLOBAL_TIMEZONE timezone
#define TRI_HAVE_POSIX 1 #define TRI_HAVE_POSIX 1
#define TRI_HAVE_MACOS_MEM_STATS 1 #define TRI_HAVE_MACOS_MEM_STATS 1
@ -463,8 +461,6 @@
/// @brief available features /// @brief available features
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#define GLOBAL_TIMEZONE timezone
#define TRI_GCC_THREAD_LOCAL_STORAGE 1 #define TRI_GCC_THREAD_LOCAL_STORAGE 1
#define TRI_HAVE_POSIX 1 #define TRI_HAVE_POSIX 1
@ -646,9 +642,6 @@
#define TRI_HAVE_LINENOISE 1 #define TRI_HAVE_LINENOISE 1
#define GLOBAL_TIMEZONE _timezone
#define TRI_HAVE_GLOBAL_TIMEZONE_PROTO 1
#define YY_NO_UNISTD_H 1 #define YY_NO_UNISTD_H 1
#define TRI_WIN32_CONSOLE 1 #define TRI_WIN32_CONSOLE 1