Skip to content

Commit 2152525

Browse files
committed
Squashed 'libs/EXTERNAL/libtatum/' changes from b39f47d..ef121c8
ef121c8 Add sign comparison warning suppression flag for flex/bison generated files c9dd0c6 Fix variable shadow warnings with gcc-4.9 git-subtree-dir: libs/EXTERNAL/libtatum git-subtree-split: ef121c85c7a8ad726d2ce165df92cc64397af3da
1 parent 7cbd1a6 commit 2152525

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
2323
add_compile_options(${WARN_FLAGS})
2424
add_compile_options(-std=c++14)
2525

26-
set(FLEX_BISON_WARN_SUPPRESS_FLAGS -Wno-switch-default -Wno-unused-parameter -Wno-missing-declarations)
26+
set(FLEX_BISON_WARN_SUPPRESS_FLAGS -Wno-switch-default -Wno-unused-parameter -Wno-sign-compare -Wno-missing-declarations)
2727
endif()
2828

2929
add_subdirectory(libtatum)

libtatum/tatum/report/TimingPath.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,15 @@ class TimingPath {
110110
public:
111111
TimingPath() = default;
112112
TimingPath(const TimingPathInfo& info,
113-
TimingSubPath clock_launch_path,
114-
TimingSubPath data_arrival_path,
115-
TimingSubPath clock_capture_path,
113+
TimingSubPath clock_launch,
114+
TimingSubPath data_arrival,
115+
TimingSubPath clock_capture,
116116
const TimingPathElem& data_required_elem,
117117
const TimingTag& slack)
118118
: path_info_(info)
119-
, clock_launch_path_(clock_launch_path)
120-
, data_arrival_path_(data_arrival_path)
121-
, clock_capture_path_(clock_capture_path)
119+
, clock_launch_path_(clock_launch)
120+
, data_arrival_path_(data_arrival)
121+
, clock_capture_path_(clock_capture)
122122
, data_required_element_(data_required_elem)
123123
, slack_tag_(slack) {
124124
//pass

libtatumparse/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ add_flex_bison_dependency(TatumLexer TatumParser)
2525
#targets for output vars to be defined
2626
set_source_files_properties(${FLEX_vpr_timing_graph_lexer_OUTPUTS}
2727
${BISON_vpr_timing_graph_parser_OUTPUTS}
28-
PROPERTIES COMPILE_FLAGS ${FLEX_BISON_WARN_SUPPRESS_FLAGS})
28+
PROPERTIES COMPILE_FLAGS "${FLEX_BISON_WARN_SUPPRESS_FLAGS}")
2929

3030

3131
#Treat .c as CXX

0 commit comments

Comments
 (0)