Skip to content

Commit 646a21c

Browse files
Ensure compatibility with GCC14
* Fixed compiler warnings * LinuxRelease should inherit from release * Removed duplicate flag * Update CMakePresets.json Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
1 parent a1c9c59 commit 646a21c

File tree

3 files changed

+31
-4
lines changed

3 files changed

+31
-4
lines changed

CMakePresets.json

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
}
3838
},
3939
{
40-
"name": "MsvcDebug",
40+
"name": "WindowsDebug",
4141
"displayName": "MSVC Debug Build",
4242
"inherits":
4343
[
@@ -50,7 +50,7 @@
5050
}
5151
},
5252
{
53-
"name": "MsvcRelease",
53+
"name": "WindowsRelease",
5454
"displayName": "MSVC Release Build",
5555
"inherits":
5656
[
@@ -61,6 +61,32 @@
6161
{
6262
"CMAKE_CXX_FLAGS": "/EHsc /Gy /MP /D_CRT_SECURE_NO_WARNINGS /W4 /w14242 /w14254 /w14263 /w14265 /w14287 /we4289 /w14296 /w14311 /w14545 /w14546 /w14547 /w14549 /w14555 /w14619 /w14640 /w14826 /w14905 /w14906 /w14928"
6363
}
64+
},
65+
{
66+
"name": "LinuxDebug",
67+
"displayName": "Linux Debug Build",
68+
"inherits":
69+
[
70+
"_RootConfig",
71+
"_DebugBase"
72+
],
73+
"cacheVariables":
74+
{
75+
"CMAKE_CXX_FLAGS": "-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -fstack-clash-protection -fcf-protection=full -Wall -Werror -Wpedantic -Wshadow -Wnon-virtual-dtor -Wold-style-cast -Wcast-align -Wunused -Woverloaded-virtual -Wconversion -Wsign-conversion -Wnull-dereference -Wdouble-promotion -Wformat=2 -Wimplicit-fallthrough -Wmisleading-indentation -Wduplicated-cond -Wlogical-op -Wuseless-cast -Wduplicated-branches -Wsuggest-override"
76+
}
77+
},
78+
{
79+
"name": "LinuxRelease",
80+
"displayName": "Linux Release Build",
81+
"inherits":
82+
[
83+
"_RootConfig",
84+
"_ReleaseBase"
85+
],
86+
"cacheVariables":
87+
{
88+
"CMAKE_CXX_FLAGS": "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -D_GLIBCXX_ASSERTIONS -fstack-protector-strong -fstack-clash-protection -fcf-protection=full -Wall -Werror -Wpedantic -Wshadow -Wnon-virtual-dtor -Wold-style-cast -Wcast-align -Wunused -Woverloaded-virtual -Wconversion -Wsign-conversion -Wnull-dereference -Wdouble-promotion -Wformat=2 -Wimplicit-fallthrough -Wmisleading-indentation -Wduplicated-cond -Wlogical-op -Wuseless-cast -Wduplicated-branches -Wsuggest-override"
89+
}
6490
}
6591
]
66-
}
92+
}

include/AVEVA/RocksDB/Plugin/Core/FileCache.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <thread>
1616
#include <unordered_map>
1717
#include <queue>
18+
#include <condition_variable>
1819
namespace AVEVA::RocksDB::Plugin::Core
1920
{
2021
class FileCache

src/AVEVA/RocksDB/Plugin/Azure/Impl/BlobFilesystemImpl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ namespace AVEVA::RocksDB::Plugin::Azure::Impl
576576
// TODO: Check if there is already a file with this name
577577
const auto size = BlobHelpers::GetFileSize(srcClient);
578578
const auto cap = BlobHelpers::GetBlobCapacity(srcClient);
579-
destClient.CreateIfNotExists(cap);
579+
destClient.CreateIfNotExists(static_cast<int64_t>(cap));
580580
::Azure::Storage::Blobs::DownloadBlobOptions opt;
581581
opt.Range.Emplace(0, size);
582582
const auto downloadResponse = srcClient.Download(opt);

0 commit comments

Comments
 (0)