Skip to content

Commit c313635

Browse files
committed
Update to C++17 minimum requirement.
Plus small changes to make compiler happy. Signed-off-by: Henner Zeller <hzeller@google.com>
1 parent 3c1ea08 commit c313635

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ add_definitions("-DVTR_ASSERT_LEVEL=${VTR_ASSERT_LEVEL}")
8989
include(CheckCXXCompilerFlag)
9090

9191
#
92-
# We require c++14 support
92+
# We require c++17 support
9393
#
94-
set(CMAKE_CXX_STANDARD 14)
94+
set(CMAKE_CXX_STANDARD 17)
9595
set(CMAKE_CXX_STANDARD_REQUIRED ON)
9696
set(CMAKE_CXX_EXTENSIONS OFF) #No compiler specific extensions
9797

vpr/src/route/rr_graph.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1583,8 +1583,7 @@ static std::function<void(t_chan_width*)> alloc_and_load_rr_graph(RRGraphBuilder
15831583
}
15841584
VTR_LOG("CHAN->CHAN type edge count:%d\n", num_edges);
15851585
num_edges = 0;
1586-
std::function<void(t_chan_width*)> update_chan_width = [](t_chan_width*) {
1587-
};
1586+
std::function<void(t_chan_width*)> update_chan_width = [](t_chan_width*) noexcept {};
15881587
if (clock_modeling == DEDICATED_NETWORK) {
15891588
ClockRRGraphBuilder builder(chan_width, grid, &L_rr_node, &rr_graph_builder);
15901589
builder.create_and_append_clock_rr_graph(num_seg_types_x, &rr_edges_to_create);

0 commit comments

Comments
 (0)