From 9b8ab9ed89e0c820fddb61a8d77fb3f433569a1f Mon Sep 17 00:00:00 2001 From: Mathis Randl Date: Mon, 12 Aug 2024 13:56:59 +0200 Subject: [PATCH 1/3] build on g++13 --- include/ann_exception.h | 5 +++-- src/ann_exception.cpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/ann_exception.h b/include/ann_exception.h index 6b81373c1..b987b828c 100644 --- a/include/ann_exception.h +++ b/include/ann_exception.h @@ -2,6 +2,7 @@ // Licensed under the MIT license. #pragma once +#include #include #include #include @@ -19,7 +20,7 @@ class ANNException : public std::runtime_error public: DISKANN_DLLEXPORT ANNException(const std::string &message, int errorCode); DISKANN_DLLEXPORT ANNException(const std::string &message, int errorCode, const std::string &funcSig, - const std::string &fileName, uint32_t lineNum); + const std::string &fileName, std::uint32_t lineNum); private: int _errorCode; @@ -29,6 +30,6 @@ class FileException : public ANNException { public: DISKANN_DLLEXPORT FileException(const std::string &filename, std::system_error &e, const std::string &funcSig, - const std::string &fileName, uint32_t lineNum); + const std::string &fileName, std::uint32_t lineNum); }; } // namespace diskann diff --git a/src/ann_exception.cpp b/src/ann_exception.cpp index ba55e3655..6bf19f604 100644 --- a/src/ann_exception.cpp +++ b/src/ann_exception.cpp @@ -2,6 +2,7 @@ // Licensed under the MIT license. #include "ann_exception.h" +#include #include #include @@ -18,7 +19,7 @@ std::string package_string(const std::string &item_name, const std::string &item } ANNException::ANNException(const std::string &message, int errorCode, const std::string &funcSig, - const std::string &fileName, uint32_t lineNum) + const std::string &fileName, std::uint32_t lineNum) : ANNException(package_string(std::string("FUNC"), funcSig) + package_string(std::string("FILE"), fileName) + package_string(std::string("LINE"), std::to_string(lineNum)) + " " + message, errorCode) @@ -26,7 +27,7 @@ ANNException::ANNException(const std::string &message, int errorCode, const std: } FileException::FileException(const std::string &filename, std::system_error &e, const std::string &funcSig, - const std::string &fileName, uint32_t lineNum) + const std::string &fileName, std::uint32_t lineNum) : ANNException(std::string(" While opening file \'") + filename + std::string("\', error code: ") + std::to_string(e.code().value()) + " " + e.code().message(), e.code().value(), funcSig, fileName, lineNum) From 4a4b1e3053e63e871e661349cc032b105251973e Mon Sep 17 00:00:00 2001 From: Mathis Randl Date: Mon, 12 Aug 2024 14:08:13 +0200 Subject: [PATCH 2/3] do not change signatures --- include/ann_exception.h | 6 +++--- src/ann_exception.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/ann_exception.h b/include/ann_exception.h index b987b828c..059f1fa65 100644 --- a/include/ann_exception.h +++ b/include/ann_exception.h @@ -2,7 +2,7 @@ // Licensed under the MIT license. #pragma once -#include +#include #include #include #include @@ -20,7 +20,7 @@ class ANNException : public std::runtime_error public: DISKANN_DLLEXPORT ANNException(const std::string &message, int errorCode); DISKANN_DLLEXPORT ANNException(const std::string &message, int errorCode, const std::string &funcSig, - const std::string &fileName, std::uint32_t lineNum); + const std::string &fileName, uint32_t lineNum); private: int _errorCode; @@ -30,6 +30,6 @@ class FileException : public ANNException { public: DISKANN_DLLEXPORT FileException(const std::string &filename, std::system_error &e, const std::string &funcSig, - const std::string &fileName, std::uint32_t lineNum); + const std::string &fileName, uint32_t lineNum); }; } // namespace diskann diff --git a/src/ann_exception.cpp b/src/ann_exception.cpp index 6bf19f604..7ca0d55d5 100644 --- a/src/ann_exception.cpp +++ b/src/ann_exception.cpp @@ -2,7 +2,7 @@ // Licensed under the MIT license. #include "ann_exception.h" -#include +#include #include #include @@ -19,7 +19,7 @@ std::string package_string(const std::string &item_name, const std::string &item } ANNException::ANNException(const std::string &message, int errorCode, const std::string &funcSig, - const std::string &fileName, std::uint32_t lineNum) + const std::string &fileName, uint32_t lineNum) : ANNException(package_string(std::string("FUNC"), funcSig) + package_string(std::string("FILE"), fileName) + package_string(std::string("LINE"), std::to_string(lineNum)) + " " + message, errorCode) @@ -27,7 +27,7 @@ ANNException::ANNException(const std::string &message, int errorCode, const std: } FileException::FileException(const std::string &filename, std::system_error &e, const std::string &funcSig, - const std::string &fileName, std::uint32_t lineNum) + const std::string &fileName, uint32_t lineNum) : ANNException(std::string(" While opening file \'") + filename + std::string("\', error code: ") + std::to_string(e.code().value()) + " " + e.code().message(), e.code().value(), funcSig, fileName, lineNum) From 47506a6cf11f28ee0045029ac7fecd0419dd5f7b Mon Sep 17 00:00:00 2001 From: Mathis Randl Date: Mon, 12 Aug 2024 14:10:34 +0200 Subject: [PATCH 3/3] removed unused import --- src/ann_exception.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ann_exception.cpp b/src/ann_exception.cpp index 7ca0d55d5..ba55e3655 100644 --- a/src/ann_exception.cpp +++ b/src/ann_exception.cpp @@ -2,7 +2,6 @@ // Licensed under the MIT license. #include "ann_exception.h" -#include #include #include