try to fix compile issue

arangodb · jsteemann · May 19, 2022 · Apr 27, 2022 · Apr 27, 2022 · Apr 28, 2022
commit cc97f974f8236f25d7ce2785082c5992b8c4f20d
diff --git a/arangod/Cluster/ServerState.cpp b/arangod/Cluster/ServerState.cpp
@@ -895,9 +895,9 @@ bool ServerState::registerAtAgencyPhase1(AgencyComm& comm,
     {
       VPackObjectBuilder b(&localIdBuilder);
       localIdBuilder.add("TransactionID", VPackValue(num + 1));
-      std::stringstream ss;  // ShortName
       size_t width =
           std::max(std::to_string(num + 1).size(), static_cast<size_t>(4));
+      std::stringstream ss;  // ShortName
       ss << roleToAgencyKey(role) << std::setw(width) << std::setfill('0')
          << num + 1;
       localIdBuilder.add("ShortName", VPackValue(ss.str()));
@@ -93
8000
6,12 +936,12 @@ std::string ServerState::getShortName() const {
   if (_role == ROLE_AGENT) {
     return getId().substr(0, 13);
   }
-  std::stringstream ss;  // ShortName
   auto num = getShortId();
   if (num == 0) {
     return std::string{};  // not yet known
   }
   size_t width = std::max(std::to_string(num).size(), static_cast<size_t>(4));
+  std::stringstream ss;  // ShortName
   ss << roleToAgencyKey(getRole()) << std::setw(width) << std::setfill('0')
      << num;
   return ss.str();
@@ -1047,12 +1047,10 @@ std::string ServerState::getId() const {
 ////////////////////////////////////////////////////////////////////////////////
 
 void ServerState::setId(std::string const& id) {
-  if (id.empty()) {
-    return;
+  if (!id.empty()) {
+    std::lock_guard<std::mutex> guard(_idLock);
+    _id = id;
   }
-
-  std::lock_guard<std::mutex> guard(_idLock);
-  _id = id;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1068,11 +1066,9 @@ uint32_t ServerState::getShortId() const {
 ////////////////////////////////////////////////////////////////////////////////
 
 void ServerState::setShortId(uint32_t id) {
-  if (id == 0) {
-    return;
+  if (id != 0) {
+    _shortId.store(id, std::memory_order_relaxed);
   }
-
-  _shortId.store(id, std::memory_order_relaxed);
 }
 
 RebootId ServerState::getRebootId() const {
@@ -1187,7 +1183,7 @@ bool ServerState::checkCoordinatorState(StateEnum state) {
 
 bool ServerState::isFoxxmaster() const {
   READ_LOCKER(readLocker, _foxxmasterLock);
-  return /*!isRunningInCluster() ||*/ _foxxmaster == getId();
+  return _foxxmaster == getId();
 }
 
 std::string ServerState::getFoxxmaster() const {

diff --git a/lib/ApplicationFeatures/ApplicationServer.h b/lib/ApplicationFeatures/ApplicationServer.h
@@ -24,14 +24,15 @@
 #pragma once
 
 #include <atomic>
+#include <cstddef>
 #include <functional>
 #include <memory>
+#include <span>
 #include <string>
 #include <type_traits>
 #include <typeindex>
 #include <unordered_map>
 #include <vector>
-#include <span>
 #include <boost/type_index/ctti_type_index.hpp>
 
 #include "ApplicationFeatures/ApplicationFeature.h"

diff --git a/lib/Basics/TypeList.h b/lib/Basics/TypeList.h
@@ -24,6 +24,7 @@
 #pragma once
 
 #include <array>
+#include <cstddef>
 
 #include <frozen/string.h>
 #include <frozen/unordered_map.h>