Move sairedis to c++14 standard (sonic-net#888)

Metaswitch · Aug 10, 2021 · 7f8413a · 7f8413a
1 parent 7bd43e2
commit 7f8413a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/configure.ac b/configure.ac
@@ -92,7 +92,7 @@ AC_PATH_PROGS(SWIG, [swig3.0 swig])
 CXXFLAGS_COMMON=""
 CXXFLAGS_COMMON+=" -ansi"
 CXXFLAGS_COMMON+=" -fPIC"
-CXXFLAGS_COMMON+=" -std=c++11"
+CXXFLAGS_COMMON+=" -std=c++14"
 CXXFLAGS_COMMON+=" -Wall"
 CXXFLAGS_COMMON+=" -Wcast-align"
 CXXFLAGS_COMMON+=" -Wcast-qual"

diff --git a/lib/src/Makefile.am b/lib/src/Makefile.am
@@ -93,10 +93,10 @@ libsairedis_la_SOURCES = \
 						 sai_redis_wred.cpp
 
 libSaiRedis_a_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
-libSaiRedis_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) -std=c++14 $(CODE_COVERAGE_CXXFLAGS)
+libSaiRedis_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
 
 libsairedis_la_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
-libsairedis_la_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) -std=c++14 $(CODE_COVERAGE_CXXFLAGS)
+libsairedis_la_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
 libsairedis_la_LIBADD = -lhiredis -lswsscommon libSaiRedis.a $(CODE_COVERAGE_LIBS)
 
 

diff --git a/saiplayer/Makefile.am b/saiplayer/Makefile.am
@@ -16,9 +16,9 @@ libSaiPlayer_a_SOURCES = \
 
 
 libSaiPlayer_a_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
-libSaiPlayer_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) -std=c++14 $(CODE_COVERAGE_CXXFLAGS)
+libSaiPlayer_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
 
 saiplayer_SOURCES = saiplayer_main.cpp
 saiplayer_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
-saiplayer_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) -std=c++14 $(CODE_COVERAGE_CXXFLAGS)
+saiplayer_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
 saiplayer_LDADD = libSaiPlayer.a ../syncd/libSyncd.a ../lib/src/libSaiRedis.a -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
diff --git a/syncd/Makefile.am b/syncd/Makefile.am
@@ -61,7 +61,7 @@ libSyncd_a_SOURCES = \
 				PortMapParser.cpp
 
 libSyncd_a_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
-libSyncd_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(SAIFLAGS) -std=c++14 $(CODE_COVERAGE_CXXFLAGS)
+libSyncd_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(SAIFLAGS) $(CODE_COVERAGE_CXXFLAGS)
 
 syncd_SOURCES = main.cpp
 syncd_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)