Skip to content

Commit cc2b905

Browse files
committed
backport comment fix from main
1 parent 551ad10 commit cc2b905

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

cmake/dependencies/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,8 @@ endif()
425425
# ##############################################################################
426426
# Coinutils
427427
# ##############################################################################
428-
# Coin-OR does not support C++17/C++20 (use of 'register' storage class specifier)
428+
429+
# Coin-OR uses the 'register' storage class specifier which requires C++11.
429430
set(CMAKE_CXX_STANDARD 11)
430431
if(WIN32)
431432
set(BUILD_SHARED_LIBS OFF)

ortools/base/filesystem.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
#include <algorithm>
1717
#include <exception> // IWYU pragma: keep
18-
#include <filesystem> // NOLINT(build/c++17)
18+
#include <filesystem> // NOLINT
1919
#include <regex> // NOLINT
2020
#include <string>
2121
#include <string_view>

ortools/third_party_solvers/xpress_environment.cc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
#include "ortools/third_party_solvers/xpress_environment.h"
1717

1818
#include <cstdlib>
19-
// NOLINTNEXTLINE(build/c++17)
20-
#include <filesystem>
19+
#include <filesystem> //NOLINT
2120
#include <functional>
2221
#include <string>
2322
#include <vector>
@@ -28,7 +27,6 @@
2827
#include "absl/strings/str_cat.h"
2928
#include "absl/strings/str_join.h"
3029
#include "absl/synchronization/mutex.h"
31-
#include "ortools/base/logging.h"
3230
#include "ortools/base/status_builder.h"
3331
#include "ortools/third_party_solvers/dynamic_library.h"
3432

0 commit comments

Comments
 (0)