MMDevice/MMCore: Suppress GCC warnings for throw()

There is no way to suppress just for exception specifications, but limit the suppression to within the headers.
micro-manager · Dec 14, 2023 · 982a5cd · 982a5cd
1 parent 03df42e
commit 982a5cd
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 1 deletion.
diff --git a/MMCore/CircularBuffer.h b/MMCore/CircularBuffer.h
@@ -40,6 +40,11 @@
 #pragma warning(disable: 4290) // 'C++ exception specification ignored'
 #endif
 
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic push
+// 'dynamic exception specifications are deprecated in C++11 [-Wdeprecated]'
+#pragma GCC diagnostic ignored "-Wdeprecated"
+#endif
 
 class ThreadPool;
 class TaskSet_CopyMemory;
@@ -101,6 +106,10 @@ class CircularBuffer
    std::shared_ptr<TaskSet_CopyMemory> tasksMemCopy_;
 };
 
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
+
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
diff --git a/MMCore/Configuration.h b/MMCore/Configuration.h
@@ -25,6 +25,12 @@
 #pragma warning(disable: 4290) // 'C++ exception specification ignored'
 #endif
 
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic push
+// 'dynamic exception specifications are deprecated in C++11 [-Wdeprecated]'
+#pragma GCC diagnostic ignored "-Wdeprecated"
+#endif
+
 #include <string>
 #include <vector>
 #include <map>
@@ -119,6 +125,10 @@ class Configuration
    std::map<std::string, int> index_;
 };
 
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
+
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
diff --git a/MMCore/MMCore.h b/MMCore/MMCore.h
@@ -52,6 +52,12 @@
 #pragma warning(disable: 4290) // 'C++ exception specification ignored'
 #endif
 
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic push
+// 'dynamic exception specifications are deprecated in C++11 [-Wdeprecated]'
+#pragma GCC diagnostic ignored "-Wdeprecated"
+#endif
+
 #include "../MMDevice/DeviceThreads.h"
 #include "../MMDevice/MMDevice.h"
 #include "../MMDevice/MMDeviceConstants.h"
@@ -693,6 +699,10 @@ class CMMCore
    void loadSystemConfigurationImpl(const char* fileName) throw (CMMError);
 };
 
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
+
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
diff --git a/MMDevice/ImageMetadata.h b/MMDevice/ImageMetadata.h
@@ -27,6 +27,12 @@
 #pragma warning(disable: 4290) // 'C++ exception specification ignored'
 #endif
 
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic push
+// 'dynamic exception specifications are deprecated in C++11 [-Wdeprecated]'
+#pragma GCC diagnostic ignored "-Wdeprecated"
+#endif
+
 #include "MMDeviceConstants.h"
 
 #include <string>
@@ -319,7 +325,7 @@ class Metadata
       else
          return false;
    }
-   
+
    MetadataSingleTag GetSingleTag(const char* key) const throw (MetadataKeyError)
    {
       MetadataTag* tag = FindTag(key);
@@ -494,6 +500,10 @@ class Metadata
    typedef std::map<std::string, MetadataTag*>::const_iterator TagConstIter;
 };
 
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
+
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif