From 481cb1b7dd9d133ab6740d981dca8846e39952fd Mon Sep 17 00:00:00 2001
From: Michael Hackstein <michael@arangodb.com>
Date: Wed, 2 Sep 2015 13:26:44 +0200
Subject: [PATCH] Removed const in AssocMulti batch insert. It was non-const
 casted internally...

---
 arangod/Indexes/EdgeIndex.cpp | 4 ++--
 arangod/Indexes/EdgeIndex.h   | 2 +-
 lib/Basics/AssocMulti.h       | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arangod/Indexes/EdgeIndex.cpp b/arangod/Indexes/EdgeIndex.cpp
index 404b5ff844..05473aa773 100644
--- a/arangod/Indexes/EdgeIndex.cpp
+++ b/arangod/Indexes/EdgeIndex.cpp
@@ -446,8 +446,8 @@ int EdgeIndex::remove (TRI_doc_mptr_t const* doc,
         
 int EdgeIndex::batchInsert (std::vector<TRI_doc_mptr_t const*> const* documents, 
                             size_t numThreads) {
-  _edgesFrom->batchInsert(reinterpret_cast<std::vector<void const*> const*>(documents), numThreads);
-  _edgesTo->batchInsert(reinterpret_cast<std::vector<void const*> const*>(documents), numThreads);
+  _edgesFrom->batchInsert(reinterpret_cast<std::vector<void*> const*>(documents), numThreads);
+  _edgesTo->batchInsert(reinterpret_cast<std::vector<void*> const*>(documents), numThreads);
   
   return TRI_ERROR_NO_ERROR;
 }
diff --git a/arangod/Indexes/EdgeIndex.h b/arangod/Indexes/EdgeIndex.h
index e0b4950bd7..2a2b273626 100644
--- a/arangod/Indexes/EdgeIndex.h
+++ b/arangod/Indexes/EdgeIndex.h
@@ -100,7 +100,7 @@ namespace triagens {
          
         int remove (struct TRI_doc_mptr_t const*, bool) override final;
         
-        int batchInsert (std::vector<struct TRI_doc_mptr_t const*> const*,
+        int batchInsert (std::vector<TRI_doc_mptr_t const*> const*,
                          size_t) override final;
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/lib/Basics/AssocMulti.h b/lib/Basics/AssocMulti.h
index 966dc0a0c0..dd52e2644e 100644
--- a/lib/Basics/AssocMulti.h
+++ b/lib/Basics/AssocMulti.h
@@ -387,14 +387,14 @@ namespace triagens {
 /// @brief adds multiple elements to the array
 ////////////////////////////////////////////////////////////////////////////////
 
-        int batchInsert (std::vector<Element const*> const* data,
+        int batchInsert (std::vector<Element*> const* data,
                          size_t numThreads) {
 #ifdef TRI_CHECK_MULTI_POINTER_HASH
           check(true, true);
 #endif
           std::atomic<int> res(TRI_ERROR_NO_ERROR);
 
-          std::vector<Element const*> const& elements = *(data);
+          std::vector<Element*> const& elements = *(data);
 
           if (elements.size() < numThreads) {
             numThreads = elements.size();
@@ -428,7 +428,7 @@ namespace triagens {
                     it = partitions.emplace(bucketId, DocumentsPerBucket()).first;
                   }
 
-                  (*it).second.emplace_back(std::make_pair(const_cast<Element*>(elements[i]), hashByKey));
+                  (*it).second.emplace_back(std::make_pair(elements[i], hashByKey));
                 }
 
                 // transfer ownership to the central map