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

.travis.yml

@@ -14,6 +14,7 @@ install:
 # g++4.8.1
 - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.8; fi
 - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi
+- if [ "$CXX" = "g++" ]; then sudo /bin/bash -e 'cd /usr/bin/; for i in `ls -l |grep -- -4.6 |grep ^l |sed -e "s;.*201[0-9] ;;" -e "s; -.*;;"`; do rm -f $i; ln -s ${i}-4.8 $i; done' ; fi
 
 # clang 3.4
 - if [ "$CXX" == "clang++" ]; then sudo apt-get install --allow-unauthenticated -qq clang-3.4; fi

Installation/travisCI/script.sh

@@ -7,7 +7,8 @@ make setup || exit 1
 
 echo
 echo "$0: configuring ArangoDB"
-
+# V8 needs lib realtime:
+export LDFLAGS='-lrt -pthread'
 ./configure \
 	--enable-relative \
 	--enable-all-in-one-libev \

arangod/Replication/InitialSyncer.cpp

@@ -554,7 +554,7 @@ int InitialSyncer::handleCollectionDump (string const& cid,
       return TRI_ERROR_REPLICATION_MASTER_ERROR;
     }
 
-    int res;
+    int res = TRI_ERROR_NO_ERROR;  // Just to please the compiler
     bool checkMore = false;
     bool found;
     TRI_voc_tick_t tick;

arangod/V8Server/v8-wrapshapedjson.cpp

@@ -325,11 +325,10 @@ v8::Handle<v8::Value> TRI_WrapShapedJson (v8::Isolate* isolate,
     TRI_ASSERT(barrier->_container->_collection != nullptr);
     TRI_UseVocBase(barrier->_container->_collection->_vocbase);
     auto externalBarrier = v8::External::New(isolate, barrier);
-
+    v8::Persistent<v8::External>& per(v8g->JSBarriers[barrier]);
-    v8g->JSBarriers[barrier].Reset(isolate, externalBarrier);
+    per.Reset(isolate, externalBarrier);
     result->SetInternalField(SLOT_BARRIER, externalBarrier);
-
+    per.SetWeak(&per, WeakBarrierCallback);
-    v8g->JSBarriers[barrier].SetWeak(&v8g->JSBarriers[barrier], WeakBarrierCallback);
   }
   else {
     auto myBarrier = v8::Local<v8::External>::New(isolate, it->second);

arangosh/V8Client/arangodump.cpp

@@ -567,7 +567,7 @@ static int DumpCollection (int fd,
       return TRI_ERROR_INTERNAL;
     }
 
-    int res;
+    int res = TRI_ERROR_NO_ERROR;  // just to please the compiler
     bool checkMore = false;
     bool found;
     uint64_t tick;
@@ -924,7 +924,7 @@ static int DumpShard (int fd,
       return TRI_ERROR_INTERNAL;
     }
 
-    int res;
+    int res = TRI_ERROR_NO_ERROR;   // just to please the compiler
     bool checkMore = false;
     bool found;
     uint64_t tick;

lib/Basics/process-utils.cpp

@@ -958,7 +958,7 @@ void TRI_CreateExternalProcess (const char* executable,
 TRI_external_status_t TRI_CheckExternalProcess (TRI_external_id_t pid,
                                                 bool wait) {
   TRI_external_status_t status;
-  TRI_external_t* external;
+  TRI_external_t* external = nullptr;  // Just to please the compiler
   size_t i;
   
   TRI_LockMutex(&ExternalProcessesLock);
@@ -1193,7 +1193,7 @@ static bool ourKillProcessPID (DWORD pid) {
 ////////////////////////////////////////////////////////////////////////////////
 
 bool TRI_KillExternalProcess (TRI_external_id_t pid) {
-  TRI_external_t* external;
+  TRI_external_t* external = nullptr;  // just to please the compiler
   size_t i;
   bool ok = true;
 

lib/V8/v8-globals.h

@@ -430,7 +430,7 @@ typedef struct TRI_v8_global_s {
 /// @brief barrier mapping for weak pointers
 ////////////////////////////////////////////////////////////////////////////////
 
-  std::map< void*, v8::Persistent<v8::External> > JSBarriers;
+  std::unordered_map< void*, v8::Persistent<v8::External> > JSBarriers;
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief collection mapping for weak pointers