Fix MSVC pragma warnings (#849)

atmtools · Oct 22, 2024 · 98afa87 · 98afa87
2 parents 10cb0b3 + 8eb217b
commit 98afa87
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 0 deletions.
diff --git a/src/core/absorption/zeemandata.cc b/src/core/absorption/zeemandata.cc
@@ -15,14 +15,20 @@
 #include "double_imanip.h"
 #include "wigner_functions.h"
 
+#ifndef _MSC_VER
 #pragma GCC diagnostic push
 #if defined(__clang__)
 #pragma GCC diagnostic ignored "-Wdeprecated-copy-with-dtor"
 #else
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
 #endif
+#endif
+
 #include <Eigen/Dense>
+
+#ifndef _MSC_VER
 #pragma GCC diagnostic pop
+#endif
 
 bool ZeemanModel::empty() const noexcept {
     return std::isnan(mdata.gu) and std::isnan(mdata.gl);
@@ -429,8 +435,10 @@ AllPolarizationVectors AllPolarization_deta(Numeric theta,
   return pv;
 }
 
+#ifndef _MSC_VER
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wreturn-type"
+#endif
 const PolarizationVector& SelectPolarization(const AllPolarizationVectors& data,
                                              Polarization type) noexcept {
   switch (type) {
@@ -444,7 +452,9 @@ const PolarizationVector& SelectPolarization(const AllPolarizationVectors& data,
       return data.sm;  //! This should never be reached
   }
 }
+#ifndef _MSC_VER
 #pragma GCC diagnostic pop
+#endif
 
 void sum_propmat(PropmatVectorView pm, const ConstComplexVectorView &abs,
                  const PolarizationVector &polvec) {

diff --git a/src/core/legendre/legendre.cpp b/src/core/legendre/legendre.cpp
@@ -22,8 +22,10 @@ constexpr Numeric longitude_clamp(Numeric lon) {
   return lon;
 }
 
+#ifndef _MSC_VER
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif
 
 std::pair<Matrix, Matrix> schmidt(const Numeric theta, const Index nmax) {
   ARTS_USER_ERROR_IF(
@@ -123,7 +125,9 @@ Vector3 schmidt_fieldcalc(const Matrix& g,
 
   return B;
 }
+#ifndef _MSC_VER
 #pragma GCC diagnostic pop
+#endif
 
 constexpr Numeric next(Numeric p0, Numeric p1, Numeric ni, Numeric x) {
   return ((2.0 * ni + 1.0) * x * p1 - ni * p0) / (ni + 1.0);

diff --git a/src/core/lineshapemodel.cc b/src/core/lineshapemodel.cc
@@ -332,8 +332,10 @@ std::istream& LineShape::from_linemixingdata(std::istream& data,
   return data;
 }
 
+#ifndef _MSC_VER
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wreturn-type"
+#endif
 void LineShape::LegacyPressureBroadeningData::vector2modelpb(
     LineShapeTypeOld& mtype,
     bool& self,
@@ -464,7 +466,9 @@ void LineShape::LegacyPressureBroadeningData::vector2modelpb(
       }
   }
 }
+#ifndef _MSC_VER
 #pragma GCC diagnostic pop
+#endif
 
 LineShape::Model LineShape::LegacyLineMixingData::vector2modellm(
     Vector x, LineShape::LegacyLineMixingData::TypeLM type) {
@@ -775,8 +779,10 @@ ArrayOfString ModelMetaDataArray(const LineShape::Model&,
   return as;
 }
 
+#ifndef _MSC_VER
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wreturn-type"
+#endif
 Numeric& SingleModelParameter(ModelParameters& mp, const String& type) {
   if (type == "X0") return mp.X0;
   if (type == "X1") return mp.X1;
@@ -788,7 +794,9 @@ Numeric& SingleModelParameter(ModelParameters& mp, const String& type) {
       "See documentation for accepted types\n",
       type)
 }
+#ifndef _MSC_VER
 #pragma GCC diagnostic pop
+#endif
 
 std::ostream& operator<<(std::ostream& os, const ModelParameters& mp) {
   os << mp.type << ' ' << mp.X0 << ' ' << mp.X1 << ' ' << mp.X2 << ' ' << mp.X3

diff --git a/src/core/matpack/matpack_eigen.h b/src/core/matpack/matpack_eigen.h
@@ -1,13 +1,19 @@
 #pragma once
 
+#ifndef _MSC_VER
 #pragma GCC diagnostic push
 #if defined(__clang__)
 #pragma GCC diagnostic ignored "-Wdeprecated-copy-with-dtor"
 #else
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
 #endif
+#endif
+
 #include <Eigen/Dense>
+
+#ifndef _MSC_VER
 #pragma GCC diagnostic pop
+#endif
 
 #include "matpack_concepts.h"
 

diff --git a/src/core/minimize.h b/src/core/minimize.h
@@ -5,12 +5,18 @@
 
 #include <matpack.h>
 
+#ifndef _MSC_VER
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wshadow"
 #pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Wfloat-conversion"
+#endif
+
 #include <unsupported/Eigen/NonLinearOptimization>
+
+#ifndef _MSC_VER
 #pragma GCC diagnostic pop
+#endif
 
 namespace Minimize {
 //! Functor for minimizing X0 + X1 * X + X2 * X**2 + ... XN * X**N - Y

diff --git a/src/core/operators/operators.h b/src/core/operators/operators.h
@@ -7,11 +7,13 @@
 
 #include "debug.h"
 
+#ifndef _MSC_VER
 #if defined(__clang__)
 #elif defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wnon-template-friend"
 #endif
+#endif
 
 template <typename R, typename... Args>
 struct CustomOperator {
@@ -28,10 +30,12 @@ struct CustomOperator {
   }
 };
 
+#ifndef _MSC_VER
 #if defined(__clang__)
 #elif defined(__GNUC__)
 #pragma GCC diagnostic pop
 #endif
+#endif
 
 using NumericUnaryOperator  = CustomOperator<Numeric, Numeric>;
 using NumericBinaryOperator = CustomOperator<Numeric, Numeric, Numeric>;

diff --git a/src/m_oem.cc b/src/m_oem.cc
@@ -29,7 +29,9 @@
 #include "debug.h"
 #include "jacobian.h"
 
+#ifndef _MSC_VER
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif
 
 #ifdef OEM_SUPPORT
 #include "oem.h"