1
0
Fork 0
This commit is contained in:
Jan Steemann 2014-06-16 09:50:38 +02:00
parent ae6ac271e3
commit b3d18d0deb
4 changed files with 12 additions and 11 deletions

View File

@ -71,6 +71,9 @@ namespace triagens {
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
struct CollectorCache { struct CollectorCache {
CollectorCache (CollectorCache const&) = delete;
CollectorCache& operator= (CollectorCache const&) = delete;
explicit CollectorCache (TRI_voc_cid_t collectionId, explicit CollectorCache (TRI_voc_cid_t collectionId,
TRI_voc_tick_t databaseId, TRI_voc_tick_t databaseId,
Logfile* logfile, Logfile* logfile,

View File

@ -1072,7 +1072,7 @@ static TRI_json_t* JsonShapeDataNumber (TRI_shaper_t* shaper,
uint64_t size) { uint64_t size) {
TRI_shape_number_t v; TRI_shape_number_t v;
v = * (TRI_shape_number_t const*) data; v = * (TRI_shape_number_t const*) (void const*) data;
return TRI_CreateNumberJson(shaper->_memoryZone, v); return TRI_CreateNumberJson(shaper->_memoryZone, v);
} }
@ -1561,7 +1561,7 @@ static bool StringifyJsonShapeDataNumber (TRI_shaper_t* shaper,
TRI_shape_number_t v; TRI_shape_number_t v;
int res; int res;
v = * (TRI_shape_number_t const*) data; v = * (TRI_shape_number_t const*) (void const*) data;
// check for special values // check for special values
// yes, this is intentional // yes, this is intentional

View File

@ -54,17 +54,15 @@ namespace triagens {
_readBuffer(TRI_UNKNOWN_MEM_ZONE), _readBuffer(TRI_UNKNOWN_MEM_ZONE),
_requestTimeout(requestTimeout), _requestTimeout(requestTimeout),
_warn(warn), _warn(warn),
_locationRewriter(), _state(IN_CONNECT),
_written(0),
_errorMessage(""),
_locationRewriter({0, 0}),
_nextChunkedSize(0), _nextChunkedSize(0),
_result(0), _result(nullptr),
_maxPacketSize(128 * 1024 * 1024), _maxPacketSize(128 * 1024 * 1024),
_keepAlive(true) { _keepAlive(true) {
_locationRewriter = { 0, 0 };
_errorMessage = "";
_written = 0;
_state = IN_CONNECT;
if (_connection->isConnected()) { if (_connection->isConnected()) {
_state = FINISHED; _state = FINISHED;
} }

View File

@ -55,8 +55,8 @@ class TRI_Utf8ValueNFC {
~TRI_Utf8ValueNFC (); ~TRI_Utf8ValueNFC ();
// Disallow copying and assigning. // Disallow copying and assigning.
TRI_Utf8ValueNFC(const TRI_Utf8ValueNFC&) = delete; TRI_Utf8ValueNFC (TRI_Utf8ValueNFC const&) = delete;
void operator=(const TRI_Utf8ValueNFC&) = delete; TRI_Utf8ValueNFC& operator= (TRI_Utf8ValueNFC const&) = delete;
inline char* operator* () { inline char* operator* () {
return _str; return _str;