fix issues (arangodb#9236)

jsteemann · web-flow · commit 63eadb1d7970 · 2019-06-08T19:40:42.000+02:00
diff --git a/arangod/Cluster/ClusterCollectionCreationInfo.cpp b/arangod/Cluster/ClusterCollectionCreationInfo.cpp
@@ -21,10 +21,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "ClusterCollectionCreationInfo.h"
+#include "Basics/StaticStrings.h"
+#include "Basics/VelocyPackHelper.h"
 
-#include <velocypack/Builder.h>
 #include <velocypack/Collection.h>
-#include <velocypack/Slice.h>
 #include <velocypack/velocypack-aliases.h>
 
 arangodb::ClusterCollectionCreationInfo::ClusterCollectionCreationInfo(
@@ -53,7 +53,7 @@ arangodb::ClusterCollectionCreationInfo::ClusterCollectionCreationInfo(
   }
 }
 
-VPackSlice const arangodb::ClusterCollectionCreationInfo::isBuildingSlice() const {
+VPackSlice arangodb::ClusterCollectionCreationInfo::isBuildingSlice() const {
   if (needsBuildingFlag()) {
     return _isBuildingJson.slice();
   }
@@ -63,4 +63,4 @@ VPackSlice const arangodb::ClusterCollectionCreationInfo::isBuildingSlice() cons
 bool arangodb::ClusterCollectionCreationInfo::needsBuildingFlag() const {
   return numberOfShards > 0 ||
          arangodb::basics::VelocyPackHelper::getBooleanValue(json, StaticStrings::IsSmart, false);
-}
+}
diff --git a/arangod/Cluster/ClusterCollectionCreationInfo.h b/arangod/Cluster/ClusterCollectionCreationInfo.h
@@ -21,13 +21,11 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #ifndef ARANGOD_CLUSTER_CLUSTER_COLLECTION_CREATION_INFO_H
-#define ARANGOD_CLUSTER_CLUSTER_COLLECTION_CREATION__INFO_H 1
+#define ARANGOD_CLUSTER_CLUSTER_COLLECTION_CREATION_INFO_H 1
 
 #include "Basics/Common.h"
 
-#include "Basics/StaticStrings.h"
-#include "Basics/VelocyPackHelper.h"
-
+#include <velocypack/Builder.h>
 #include <velocypack/Slice.h>
 
 namespace arangodb {
@@ -45,15 +43,15 @@ struct ClusterCollectionCreationInfo {
   std::string name;
   State state;
 
-public:
-  velocypack::Slice const isBuildingSlice() const;
-
+ public:
+  velocypack::Slice isBuildingSlice() const;
+ 
  private:
+  bool needsBuildingFlag() const;
 
+ private:
   velocypack::Builder _isBuildingJson;
-private:
-  bool needsBuildingFlag() const;
 };
 }  // namespace arangodb
 
-#endif
+#endif
