Partially revert 1c7521a7910: swig chokes on the macro

NREL · Sep 1, 2022 · 019c0b5 · 019c0b5
1 parent 1c7521a
commit 019c0b5
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 51 deletions.
diff --git a/src/energyplus/ForwardTranslator.cpp b/src/energyplus/ForwardTranslator.cpp
@@ -2919,14 +2919,23 @@ namespace energyplus {
         break;
       }
 
-        DISABLE_WARNING_PUSH
-        DISABLE_WARNING_DEPRECATED
+#if defined(_MSC_VER)
+#  pragma warning(push)
+#  pragma warning(disable : 4996)
+#elif (defined(__GNUC__))
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
       case openstudio::IddObjectType::OS_Table_MultiVariableLookup: {
         model::TableMultiVariableLookup table = modelObject.cast<TableMultiVariableLookup>();
         retVal = translateTableMultiVariableLookup(table);
         break;
       }
-        DISABLE_WARNING_POP
+#if defined(_MSC_VER)
+#  pragma warning(pop)
+#elif (defined(__GNUC__))
+#  pragma GCC diagnostic pop
+#endif
 
       case openstudio::IddObjectType::OS_Table_Lookup: {
         auto table = modelObject.cast<TableLookup>();

diff --git a/src/energyplus/ForwardTranslator/ForwardTranslateTableMultiVariableLookup.cpp b/src/energyplus/ForwardTranslator/ForwardTranslateTableMultiVariableLookup.cpp
@@ -48,8 +48,13 @@ namespace openstudio {
 
 namespace energyplus {
 
-  DISABLE_WARNING_PUSH
-  DISABLE_WARNING_DEPRECATED
+#if defined(_MSC_VER)
+#  pragma warning(push)
+#  pragma warning(disable : 4996)
+#elif (defined(__GNUC__))
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
 
   boost::optional<IdfObject> ForwardTranslator::translateTableMultiVariableLookup(TableMultiVariableLookup& modelObject) {
     OptionalString s;
@@ -189,7 +194,11 @@ namespace energyplus {
     return tableLookup;
   }
 
-  DISABLE_WARNING_POP
+#if defined(_MSC_VER)
+#  pragma warning(pop)
+#elif (defined(__GNUC__))
+#  pragma GCC diagnostic pop
+#endif
 
 }  // namespace energyplus
 

diff --git a/src/model/Model.cpp b/src/model/Model.cpp
@@ -47,7 +47,6 @@
 
 #include "../utilities/core/Assert.hpp"
 #include "../utilities/core/PathHelpers.hpp"
-#include "../utilities/core/Deprecated.hpp"
 
 #include "../utilities/idd/IddEnums.hpp"
 #include "../utilities/idd/IddObject_Impl.hpp"
@@ -4260,12 +4259,19 @@ namespace model {
     REGISTER_CONSTRUCTOR(SurfacePropertyOtherSideConditionsModel);
     REGISTER_CONSTRUCTOR(SurfacePropertySurroundingSurfaces);
     REGISTER_CONSTRUCTOR(SwimmingPoolIndoor);
-
-    DISABLE_WARNING_PUSH
-    DISABLE_WARNING_DEPRECATED
+#if defined(_MSC_VER)
+#  pragma warning(push)
+#  pragma warning(disable : 4996)
+#elif (defined(__GNUC__))
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
     REGISTER_CONSTRUCTOR(TableMultiVariableLookup);
-    DISABLE_WARNING_POP
-
+#if defined(_MSC_VER)
+#  pragma warning(pop)
+#elif (defined(__GNUC__))
+#  pragma GCC diagnostic pop
+#endif
     REGISTER_CONSTRUCTOR(TableLookup);
     REGISTER_CONSTRUCTOR(TableIndependentVariable);
     REGISTER_CONSTRUCTOR(TemperingValve);
@@ -4806,12 +4812,19 @@ namespace model {
     REGISTER_COPYCONSTRUCTORS(SurfacePropertyOtherSideConditionsModel);
     REGISTER_COPYCONSTRUCTORS(SurfacePropertySurroundingSurfaces);
     REGISTER_COPYCONSTRUCTORS(SwimmingPoolIndoor);
-
-    DISABLE_WARNING_PUSH
-    DISABLE_WARNING_DEPRECATED
+#if defined(_MSC_VER)
+#  pragma warning(push)
+#  pragma warning(disable : 4996)
+#elif (defined(__GNUC__))
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
     REGISTER_COPYCONSTRUCTORS(TableMultiVariableLookup);
-    DISABLE_WARNING_POP
-
+#if defined(_MSC_VER)
+#  pragma warning(pop)
+#elif (defined(__GNUC__))
+#  pragma GCC diagnostic pop
+#endif
     REGISTER_COPYCONSTRUCTORS(TableLookup);
     REGISTER_COPYCONSTRUCTORS(TableIndependentVariable);
     REGISTER_COPYCONSTRUCTORS(TemperingValve);

diff --git a/src/model/TableMultiVariableLookup.cpp b/src/model/TableMultiVariableLookup.cpp
@@ -27,10 +27,13 @@
 *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************************************************************/
 
-#include "../utilities/core/Deprecated.hpp"
-
-DISABLE_WARNING_PUSH
-DISABLE_WARNING_DEPRECATED
+#if defined(_MSC_VER)
+#  pragma warning(push)
+#  pragma warning(disable : 4996)
+#elif (defined(__GNUC__))
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
 
 #include "TableMultiVariableLookup.hpp"
 #include "TableMultiVariableLookup_Impl.hpp"
@@ -1349,4 +1352,8 @@ namespace model {
 }  // namespace model
 }  // namespace openstudio
 
-DISABLE_WARNING_POP
+#if defined(_MSC_VER)
+#  pragma warning(pop)
+#elif (defined(__GNUC__))
+#  pragma GCC diagnostic pop
+#endif
diff --git a/src/model/TableMultiVariableLookup.hpp b/src/model/TableMultiVariableLookup.hpp
@@ -340,8 +340,13 @@ namespace model {
     REGISTER_LOGGER("openstudio.model.TableMultiVariableLookup");
   };
 
-  DISABLE_WARNING_PUSH
-  DISABLE_WARNING_DEPRECATED
+#if defined(_MSC_VER)
+#  pragma warning(push)
+#  pragma warning(disable : 4996)
+#elif (defined(__GNUC__))
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
 
   /** \relates TableMultiVariableLookup*/
   using OptionalTableMultiVariableLookup = boost::optional<TableMultiVariableLookup>;
@@ -351,8 +356,11 @@ namespace model {
 
   /** \relates TableMultiVariableLookupPoint*/
   using TableMultiVariableLookupPointVector = std::vector<TableMultiVariableLookupPoint>;
-
-  DISABLE_WARNING_POP
+#if defined(_MSC_VER)
+#  pragma warning(pop)
+#elif (defined(__GNUC__))
+#  pragma GCC diagnostic pop
+#endif
 
 }  // namespace model
 }  // namespace openstudio

diff --git a/src/model/test/TableMultiVariableLookup_GTest.cpp b/src/model/test/TableMultiVariableLookup_GTest.cpp
@@ -31,10 +31,13 @@
 
 #include "ModelFixture.hpp"
 
-#include "../../utilities/core/Deprecated.hpp"
-
-DISABLE_WARNING_PUSH
-DISABLE_WARNING_DEPRECATED
+#if defined(_MSC_VER)
+#  pragma warning(push)
+#  pragma warning(disable : 4996)
+#elif (defined(__GNUC__))
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
 
 #include "../TableMultiVariableLookup.hpp"
 #include "../TableMultiVariableLookup_Impl.hpp"
@@ -335,4 +338,8 @@ TEST_F(ModelFixture, TableMultiVariablePointOrder2) {
   EXPECT_EQ(324, points[23].y());
 }
 
-DISABLE_WARNING_POP
+#if defined(_MSC_VER)
+#  pragma warning(pop)
+#elif (defined(__GNUC__))
+#  pragma GCC diagnostic pop
+#endif
diff --git a/src/utilities/core/Deprecated.hpp b/src/utilities/core/Deprecated.hpp
@@ -57,24 +57,4 @@
 #  define OS_DEPRECATED
 #endif
 
-// Adapted from: https://www.fluentcpp.com/2019/08/30/how-to-disable-a-warning-in-cpp/
-// clang-format off
-#if defined(_MSC_VER)
-  #define DISABLE_WARNING_PUSH           __pragma(warning( push ))
-  #define DISABLE_WARNING_POP            __pragma(warning( pop ))
-  #define DISABLE_WARNING(warningNumber) __pragma(warning( disable : warningNumber ))
-
-  #define DISABLE_WARNING_DEPRECATED DISABLE_WARNING(4996)
-
-#elif defined(__GNUC__) || defined(__clang__)
-  #define DO_PRAGMA(X) _Pragma(#X)
-  #define DISABLE_WARNING_PUSH           DO_PRAGMA(GCC diagnostic push)
-  #define DISABLE_WARNING_POP            DO_PRAGMA(GCC diagnostic pop)
-  #define DISABLE_WARNING(warningName)   DO_PRAGMA(GCC diagnostic ignored #warningName)
-
-  #define DISABLE_WARNING_DEPRECATED DISABLE_WARNING(-Wdeprecated-declarations)
-
-#endif
-// clang-format on
-
 #endif  // UTILITIES_CORE_DEPRECATED_HPP