Include <cstdint> in all files that use std::int*_t or std::uint*_t t…

…ypes The missing include in AnnService/inc/Helper/DiskIO.h causes a build failure when building with GCC 13 on Linux. Fixes: https://bugs.debian.org/1037866 Fixes: microsoft#389
pabs3 · Jun 16, 2023 · 6e9bb98 · 6e9bb98
1 parent 4ff1fef
commit 6e9bb98
Show file tree

Hide file tree

Showing 74 changed files with 108 additions and 7 deletions.
diff --git a/AnnService/inc/Aggregator/AggregatorExecutionContext.h b/AnnService/inc/Aggregator/AggregatorExecutionContext.h
@@ -9,6 +9,7 @@
 
 #include <memory>
 #include <atomic>
+#include <cstdint>
 
 namespace SPTAG
 {

diff --git a/AnnService/inc/Aggregator/AggregatorSettings.h b/AnnService/inc/Aggregator/AggregatorSettings.h
@@ -7,6 +7,7 @@
 #include "../Core/Common.h"
 
 #include <string>
+#include <cstdint>
 
 namespace SPTAG
 {

diff --git a/AnnService/inc/Client/ClientWrapper.h b/AnnService/inc/Client/ClientWrapper.h
@@ -17,6 +17,7 @@
 #include <mutex>
 #include <condition_variable>
 #include <functional>
+#include <cstdint>
 
 namespace SPTAG
 {

diff --git a/AnnService/inc/Client/Options.h b/AnnService/inc/Client/Options.h
@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 #include <memory>
+#include <cstdint>
 
 namespace SPTAG
 {

diff --git a/AnnService/inc/Core/BKT/Index.h b/AnnService/inc/Core/BKT/Index.h
@@ -23,6 +23,7 @@
 
 #include <functional>
 #include <shared_mutex>
+#include <cstdint>
 
 namespace SPTAG
 {

diff --git a/AnnService/inc/Core/Common/BKTree.h b/AnnService/inc/Core/Common/BKTree.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 #include <shared_mutex>
+#include <cstdint>
 
 #include "inc/Core/VectorIndex.h"
 

diff --git a/AnnService/inc/Core/Common/Dataset.h b/AnnService/inc/Core/Common/Dataset.h
@@ -7,6 +7,7 @@
 #include "inc/Helper/Logging.h"
 #include <stdexcept>
 #include <sstream>
+#include <cstdint>
 
 namespace SPTAG
 {
@@ -237,4 +238,4 @@ namespace SPTAG
     }
 }
 
-#endif // _SPTAG_COMMON_DATASET_H_
+#endif // _SPTAG_COMMON_DATASET_H_
diff --git a/AnnService/inc/Core/Common/DistanceUtils.h b/AnnService/inc/Core/Common/DistanceUtils.h
@@ -6,6 +6,7 @@
 
 #include <functional>
 #include <iostream>
+#include <cstdint>
 
 #include "CommonUtils.h"
 #include "InstructionUtils.h"

diff --git a/AnnService/inc/Core/Common/KDTree.h b/AnnService/inc/Core/Common/KDTree.h
@@ -7,6 +7,7 @@
 #include <vector>
 #include <string>
 #include <shared_mutex>
+#include <cstdint>
 
 #include "inc/Core/VectorIndex.h"
 

diff --git a/AnnService/inc/Core/Common/Labelset.h b/AnnService/inc/Core/Common/Labelset.h
@@ -5,6 +5,8 @@
 #define _SPTAG_COMMON_LABELSET_H_
 
 #include <atomic>
+#include <cstdint>
+
 #include "Dataset.h"
 
 namespace SPTAG

diff --git a/AnnService/inc/Core/Common/NeighborhoodGraph.h b/AnnService/inc/Core/Common/NeighborhoodGraph.h
@@ -14,6 +14,7 @@
 #include <chrono>
 #include <queue>
 #include <atomic>
+#include <cstdint>
 
 #if defined(GPU)
 #include <cuda.h>

diff --git a/AnnService/inc/Core/Common/OPQQuantizer.h b/AnnService/inc/Core/Common/OPQQuantizer.h
@@ -5,6 +5,8 @@
 
 #include "PQQuantizer.h"
 
+#include <cstdint>
+
 #if (__cplusplus < 201703L)
 #define ISNOTSAME(A, B) if (!std::is_same<A, B>::value)
 #else

diff --git a/AnnService/inc/Core/Common/PQQuantizer.h b/AnnService/inc/Core/Common/PQQuantizer.h
@@ -13,6 +13,7 @@
 #include <memory>
 #include <cassert>
 #include <cstring>
+#include <cstdint>
 
 
 namespace SPTAG

diff --git a/AnnService/inc/Core/Common/SIMDUtils.h b/AnnService/inc/Core/Common/SIMDUtils.h
@@ -6,6 +6,7 @@
 
 #include <functional>
 #include <iostream>
+#include <cstdint>
 
 #include "CommonUtils.h"
 #include "InstructionUtils.h"

diff --git a/AnnService/inc/Core/CommonDataStructure.h b/AnnService/inc/Core/CommonDataStructure.h
@@ -6,6 +6,8 @@
 
 #include "inc/Core/Common.h"
 
+#include <cstdint>
+
 namespace SPTAG
 {
 

diff --git a/AnnService/inc/Core/DefinitionList.h b/AnnService/inc/Core/DefinitionList.h
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+#include <cstdint>
+
 #ifdef DefineVectorValueType
 
 DefineVectorValueType(Int8, std::int8_t)
@@ -139,4 +141,4 @@ DefineNumaStrategy(SCATTER)
 DefineOrderStrategy(ASC)
 DefineOrderStrategy(DESC)
 
-#endif // DefineOrderStrategy
+#endif // DefineOrderStrategy
diff --git a/AnnService/inc/Core/KDT/Index.h b/AnnService/inc/Core/KDT/Index.h
@@ -23,6 +23,7 @@
 
 #include <functional>
 #include <shared_mutex>
+#include <cstdint>
 
 namespace SPTAG
 {

diff --git a/AnnService/inc/Core/MetadataSet.h b/AnnService/inc/Core/MetadataSet.h
@@ -6,6 +6,8 @@
 
 #include "CommonDataStructure.h"
 
+#include <cstdint>
+
 namespace SPTAG
 {
 

diff --git a/AnnService/inc/Core/SPANN/ExtraFullGraphSearcher.h b/AnnService/inc/Core/SPANN/ExtraFullGraphSearcher.h
@@ -15,6 +15,7 @@
 #include <climits>
 #include <future>
 #include <numeric>
+#include <cstdint>
 
 namespace SPTAG
 {

diff --git a/AnnService/inc/Core/SPANN/IExtraSearcher.h b/AnnService/inc/Core/SPANN/IExtraSearcher.h
@@ -13,6 +13,7 @@
 #include <vector>
 #include <chrono>
 #include <atomic>
+#include <cstdint>
 
 namespace SPTAG {
     namespace SPANN {
@@ -210,4 +211,4 @@ namespace SPTAG {
     } // SPANN
 } // SPTAG
 
-#endif // _SPTAG_SPANN_IEXTRASEARCHER_H_
+#endif // _SPTAG_SPANN_IEXTRASEARCHER_H_
diff --git a/AnnService/inc/Core/SPANN/Index.h b/AnnService/inc/Core/SPANN/Index.h
@@ -27,6 +27,7 @@
 
 #include <functional>
 #include <shared_mutex>
+#include <cstdint>
 
 namespace SPTAG
 {

diff --git a/AnnService/inc/Core/SearchQuery.h b/AnnService/inc/Core/SearchQuery.h
@@ -7,6 +7,7 @@
 #include "SearchResult.h"
 
 #include <cstring>
+#include <cstdint>
 
 namespace SPTAG
 {

diff --git a/AnnService/inc/Core/VectorIndex.h b/AnnService/inc/Core/VectorIndex.h
@@ -10,6 +10,7 @@
 #include "MetadataSet.h"
 #include "inc/Helper/SimpleIniReader.h"
 #include <unordered_set>
+#include <cstdint>
 #include "inc/Core/Common/IQuantizer.h"
 #include "inc/Core/Common/WorkSpace.h"
 

diff --git a/AnnService/inc/Helper/Concurrent.h b/AnnService/inc/Helper/Concurrent.h
@@ -8,6 +8,7 @@
 #include <atomic>
 #include <condition_variable>
 #include <mutex>
+#include <cstdint>
 
 
 namespace SPTAG

diff --git a/AnnService/inc/Helper/DiskIO.h b/AnnService/inc/Helper/DiskIO.h
@@ -8,6 +8,7 @@
 #include <fstream>
 #include <string.h>
 #include <memory>
+#include <cstdint>
 
 namespace SPTAG
 {

diff --git a/AnnService/inc/Helper/StringConvert.h b/AnnService/inc/Helper/StringConvert.h
@@ -13,6 +13,7 @@
 #include <cctype>
 #include <limits>
 #include <cerrno>
+#include <cstdint>
 
 namespace SPTAG
 {

diff --git a/AnnService/inc/Helper/VectorSetReader.h b/AnnService/inc/Helper/VectorSetReader.h
@@ -10,6 +10,7 @@
 #include "inc/Helper/ArgumentsParser.h"
 
 #include <memory>
+#include <cstdint>
 
 namespace SPTAG
 {

diff --git a/AnnService/inc/Helper/VectorSetReaders/MemoryReader.h b/AnnService/inc/Helper/VectorSetReaders/MemoryReader.h
@@ -6,6 +6,8 @@
 
 #include "inc/Helper/VectorSetReader.h"
 
+#include <cstdint>
+
 namespace SPTAG
 {
     namespace Helper

diff --git a/AnnService/inc/Helper/VectorSetReaders/TxtReader.h b/AnnService/inc/Helper/VectorSetReaders/TxtReader.h
@@ -10,6 +10,7 @@
 #include <atomic>
 #include <condition_variable>
 #include <mutex>
+#include <cstdint>
 
 namespace SPTAG
 {

diff --git a/AnnService/inc/Server/SearchService.h b/AnnService/inc/Server/SearchService.h
@@ -13,6 +13,7 @@
 #include <vector>
 #include <thread>
 #include <condition_variable>
+#include <cstdint>
 
 namespace SPTAG
 {

diff --git a/AnnService/inc/Socket/Client.h b/AnnService/inc/Socket/Client.h
@@ -13,6 +13,7 @@
 #include <memory>
 #include <atomic>
 #include <boost/asio.hpp>
+#include <cstdint>
 
 namespace SPTAG
 {

diff --git a/AnnService/inc/Socket/ResourceManager.h b/AnnService/inc/Socket/ResourceManager.h
@@ -16,6 +16,7 @@
 #include <deque>
 #include <unordered_map>
 #include <thread>
+#include <cstdint>
 
 namespace std
 {

diff --git a/AnnService/src/Aggregator/AggregatorContext.cpp b/AnnService/src/Aggregator/AggregatorContext.cpp
@@ -5,6 +5,7 @@
 #include "inc/Helper/SimpleIniReader.h"
 
 #include <fstream>
+#include <cstdint>
 
 using namespace SPTAG;
 using namespace SPTAG::Aggregator;
@@ -114,4 +115,4 @@ const std::shared_ptr<VectorSet>&
 AggregatorContext::GetCenters() const
 {
     return m_centers;
-}
+}
diff --git a/AnnService/src/Aggregator/AggregatorExecutionContext.cpp b/AnnService/src/Aggregator/AggregatorExecutionContext.cpp
@@ -3,6 +3,8 @@
 
 #include "inc/Aggregator/AggregatorExecutionContext.h"
 
+#include <cstdint>
+
 using namespace SPTAG;
 using namespace SPTAG::Aggregator;
 

diff --git a/AnnService/src/Aggregator/AggregatorService.cpp b/AnnService/src/Aggregator/AggregatorService.cpp
@@ -6,6 +6,8 @@
 #include "inc/Core/Common/DistanceUtils.h"
 #include "inc/Helper/Base64Encode.h"
 
+#include <cstdint>
+
 using namespace SPTAG;
 using namespace SPTAG::Aggregator;
 

diff --git a/AnnService/src/BalancedDataPartition/main.cpp b/AnnService/src/BalancedDataPartition/main.cpp
@@ -5,6 +5,8 @@
 #include <thread>
 #include <cstdlib>
 #include <algorithm>
+#include <cstdint>
+
 #include "inc/Core/Common/DistanceUtils.h"
 #include "inc/Core/Common/Dataset.h"
 #include "inc/Core/Common/BKTree.h"

diff --git a/AnnService/src/Client/ClientWrapper.cpp b/AnnService/src/Client/ClientWrapper.cpp
@@ -3,6 +3,8 @@
 
 #include "inc/Client/ClientWrapper.h"
 
+#include <cstdint>
+
 using namespace SPTAG;
 using namespace SPTAG::Socket;
 using namespace SPTAG::Client;

diff --git a/AnnService/src/Client/main.cpp b/AnnService/src/Client/main.cpp
@@ -7,6 +7,7 @@
 #include <cstdio>
 #include <atomic>
 #include <iostream>
+#include <cstdint>
 
 using namespace SPTAG;
 

diff --git a/AnnService/src/Core/BKT/BKTIndex.cpp b/AnnService/src/Core/BKT/BKTIndex.cpp
@@ -3,6 +3,7 @@
 
 #include "inc/Core/BKT/Index.h"
 #include <chrono>
+#include <cstdint>
 
 #pragma warning(disable:4242)  // '=' : conversion from 'int' to 'short', possible loss of data
 #pragma warning(disable:4244)  // '=' : conversion from 'int' to 'short', possible loss of data

diff --git a/AnnService/src/Core/Common/DistanceUtils.cpp b/AnnService/src/Core/Common/DistanceUtils.cpp
@@ -3,6 +3,8 @@
 
 #include "inc/Core/Common/DistanceUtils.h"
 
+#include <cstdint>
+
 using namespace SPTAG;
 using namespace SPTAG::COMMON;
 

diff --git a/AnnService/src/Core/Common/IQuantizer.cpp b/AnnService/src/Core/Common/IQuantizer.cpp
@@ -3,6 +3,8 @@
 #include <inc/Core/Common/OPQQuantizer.h>
 #include <inc/Helper/StringConvert.h>
 
+#include <cstdint>
+
 namespace SPTAG
 {
     namespace COMMON

diff --git a/AnnService/src/Core/Common/SIMDUtils.cpp b/AnnService/src/Core/Common/SIMDUtils.cpp
@@ -3,6 +3,8 @@
 
 #include "inc/Core/Common/SIMDUtils.h"
 
+#include <cstdint>
+
 using namespace SPTAG;
 using namespace SPTAG::COMMON;
 

diff --git a/AnnService/src/Core/KDT/KDTIndex.cpp b/AnnService/src/Core/KDT/KDTIndex.cpp
@@ -3,6 +3,7 @@
 
 #include "inc/Core/KDT/Index.h"
 #include <chrono>
+#include <cstdint>
 
 #pragma warning(disable:4242)  // '=' : conversion from 'int' to 'short', possible loss of data
 #pragma warning(disable:4244)  // '=' : conversion from 'int' to 'short', possible loss of data

diff --git a/AnnService/src/Core/MetadataSet.cpp b/AnnService/src/Core/MetadataSet.cpp
@@ -5,6 +5,7 @@
 
 #include <string.h>
 #include <shared_mutex>
+#include <cstdint>
 
 using namespace SPTAG;