Uses GCC diagnostic push and pop to temporarily disable diagnostics.

The use of: pragma GCC diagnostic ignored "-Weffc++" .... pragma GCC diagnostic warning "-Weffc++" enables "-Weffc++" in the including file. This is undesirable. This commit switches to using the push and pop to maintain the diagnostic state.

Author: Saxon Parker

apps/ClusterPerf.cc

@@ -45,12 +45,12 @@
 #include <iostream>
 #include <unordered_set>
 
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Weffc++"
 #include <boost/program_options.hpp>
 #include <boost/version.hpp>
-#pragma GCC diagnostic warning "-Wconversion"
-#pragma GCC diagnostic warning "-Weffc++"
+#pragma GCC diagnostic pop
 namespace po = boost::program_options;
 
 #include "BasicTransport.h"
@@ -62,6 +62,7 @@ namespace po = boost::program_options;
 #include "Util.h"
 
 #if __GNUC__ && (__GNUC__ >= 7)
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-truncation"
 #endif
 
@@ -7551,6 +7552,6 @@ catch (std::exception& e) {
 }
 
 #if __GNUC__ && (__GNUC__ >= 7)
-#pragma GCC diagnostic warning "-Wformat-truncation"
+#pragma GCC diagnostic pop
 #endif
 

apps/CoordinatorCrashRecovery.cc

@@ -22,14 +22,13 @@
 #include <iostream>
 #include <unordered_map>
 
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Weffc++"
 #pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
 #include <boost/program_options.hpp>
 #include <boost/version.hpp>
-#pragma GCC diagnostic warning "-Wconversion"
-#pragma GCC diagnostic warning "-Weffc++"
-#pragma GCC diagnostic warning "-Wnon-virtual-dtor"
+#pragma GCC diagnostic pop
 
 #include "RamCloud.h"
 #include "CoordinatorClient.h"

nanobenchmarks/Perf.cc

@@ -45,18 +45,18 @@
 #include <thread>
 #include <vector>
 
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Weffc++"
 #include <boost/program_options.hpp>
-#pragma GCC diagnostic warning "-Wconversion"
-#pragma GCC diagnostic warning "-Weffc++"
+#pragma GCC diagnostic pop
 
 #if __cplusplus >= 201402L
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Weffc++"
 #include "flat_hash_map.h"
-#pragma GCC diagnostic warning "-Wconversion"
-#pragma GCC diagnostic warning "-Weffc++"
+#pragma GCC diagnostic pop
 #endif
 
 #include "Common.h"

src/BackupStorage.h

@@ -16,11 +16,11 @@
 #ifndef RAMCLOUD_BACKUPSTORAGE_H
 #define RAMCLOUD_BACKUPSTORAGE_H
 
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Weffc++"
 #include <boost/dynamic_bitset.hpp>
-#pragma GCC diagnostic warning "-Wconversion"
-#pragma GCC diagnostic warning "-Weffc++"
+#pragma GCC diagnostic pop
 
 #include "Buffer.h"
 #include "Exception.h"

src/BasicTransport.h

@@ -19,11 +19,11 @@
 #include <deque>
 
 #if __cplusplus >= 201402L
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Weffc++"
 #include "flat_hash_map.h"
-#pragma GCC diagnostic warning "-Wconversion"
-#pragma GCC diagnostic warning "-Weffc++"
+#pragma GCC diagnostic pop
 #endif
 #include "BoostIntrusive.h"
 #include "Buffer.h"

src/BoostIntrusive.h

@@ -21,12 +21,12 @@
 #ifndef RAMCLOUD_BOOSTINTRUSIVE_H
 #define RAMCLOUD_BOOSTINTRUSIVE_H
 
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Weffc++"
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive/set.hpp>
-#pragma GCC diagnostic warning "-Wconversion"
-#pragma GCC diagnostic warning "-Weffc++"
+#pragma GCC diagnostic pop
 
 namespace RAMCloud {
 

src/CodeLocation.cc

@@ -13,11 +13,11 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Weffc++"
 #include <pcrecpp.h>
-#pragma GCC diagnostic warning "-Wconversion"
-#pragma GCC diagnostic warning "-Weffc++"
+#pragma GCC diagnostic pop
 #include "CodeLocation.h"
 
 namespace RAMCloud {

src/Common.h

@@ -31,11 +31,11 @@
 #include <cinttypes>
 #include <typeinfo>
 
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Weffc++"
 #include <boost/foreach.hpp>
-#pragma GCC diagnostic warning "-Wconversion"
-#pragma GCC diagnostic warning "-Weffc++"
+#pragma GCC diagnostic pop
 
 #define foreach BOOST_FOREACH
 #define reverse_foreach BOOST_REVERSE_FOREACH

src/CoordinatorClient.h

@@ -16,15 +16,15 @@
 #ifndef RAMCLOUD_COORDINATORCLIENT_H
 #define RAMCLOUD_COORDINATORCLIENT_H
 
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Weffc++"
 #include "MasterRecoveryInfo.pb.h"
 #include "ServerList.pb.h"
 #include "RecoveryPartition.pb.h"
 #include "TableConfig.pb.h"
 #include "ServerConfig.pb.h"
-#pragma GCC diagnostic warning "-Wconversion"
-#pragma GCC diagnostic warning "-Weffc++"
+#pragma GCC diagnostic pop
 
 #include "ClientException.h"
 #include "CoordinatorRpcWrapper.h"

src/CoordinatorServerList.h

@@ -21,13 +21,13 @@
 #include <list>
 #include <deque>
 
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Weffc++"
 #include "MasterRecoveryInfo.pb.h"
 #include "ServerListEntry.pb.h"
 #include "ServerList.pb.h"
-#pragma GCC diagnostic warning "-Wconversion"
-#pragma GCC diagnostic warning "-Weffc++"
+#pragma GCC diagnostic pop
 
 #include "AbstractServerList.h"
 #include "CoordinatorUpdateManager.h"