Skip to content

Commit be0967a

Browse files
authored
MINOR: [C++] Fix C++17-related comments (#48598)
### Rationale for this change As a followup to #48414, fix the comments that I had forgotten to update. ### Are these changes tested? No testing required. ### Are there any user-facing changes? No. Authored-by: Antoine Pitrou <[email protected]> Signed-off-by: Nic Crane <[email protected]>
1 parent f208e62 commit be0967a

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

cpp/cmake_modules/SetupCxxFlags.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ if(NOT DEFINED CMAKE_C_STANDARD)
139139
set(CMAKE_C_STANDARD 11)
140140
endif()
141141

142-
# This ensures that things like c++17 get passed correctly
142+
# This ensures that a standard higher than the minimum can be passed correctly
143143
if(NOT DEFINED CMAKE_CXX_STANDARD)
144144
set(CMAKE_CXX_STANDARD 20)
145145
elseif(${CMAKE_CXX_STANDARD} VERSION_LESS 20)

cpp/src/arrow/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1180,7 +1180,7 @@ endif()
11801180

11811181
foreach(LIB_TARGET ${ARROW_LIBRARIES})
11821182
target_compile_definitions(${LIB_TARGET} PRIVATE ARROW_EXPORTING)
1183-
# C++17 is required to compile against Arrow C++ headers and libraries
1183+
# C++20 is required to compile against Arrow C++ headers and libraries
11841184
target_compile_features(${LIB_TARGET} PUBLIC cxx_std_20)
11851185
endforeach()
11861186

matlab/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ To build the MATLAB Interface to Apache Arrow from source, the following softwar
6464

6565
1. [MATLAB](https://www.mathworks.com/products/get-matlab.html)
6666
2. [CMake](https://cmake.org/cmake/help/latest/)
67-
3. C++ compiler which supports C++17 (e.g. [`gcc`](https://gcc.gnu.org/) on Linux, [`Xcode`](https://developer.apple.com/xcode/) on macOS, or [`Visual Studio`](https://visualstudio.microsoft.com/) on Windows)
67+
3. C++ compiler which supports C++20 (e.g. [`gcc`](https://gcc.gnu.org/) on Linux, [`Xcode`](https://developer.apple.com/xcode/) on macOS, or [`Visual Studio`](https://visualstudio.microsoft.com/) on Windows)
6868
4. [Git](https://git-scm.com/)
6969

7070
## Setup

matlab/tools/cmake/BuildMatlabArrowInterface.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ libmexclass_client_add_proxy_library(
130130
INCLUDE_DIRS ${MATLAB_ARROW_LIBMEXCLASS_CLIENT_PROXY_LIBRARY_INCLUDE_DIRS}
131131
LINK_LIBRARIES arrow_shared
132132
)
133-
# Use C++17
133+
# Use C++20
134134
target_compile_features(${MATLAB_ARROW_LIBMEXCLASS_CLIENT_PROXY_LIBRARY_NAME} PRIVATE cxx_std_20)
135135
target_compile_definitions(${MATLAB_ARROW_LIBMEXCLASS_CLIENT_PROXY_LIBRARY_NAME} PRIVATE ARROW_MATLAB_EXPORTING)
136136

0 commit comments

Comments
 (0)