remove opm/grid/utility/ErrorMacros.hpp

this was used to reimplement opm-common functionality. since opm-common is now a hard dependency, it no longer serves a role.
OPM · Oct 18, 2019 · 577f730 · 577f730
1 parent d2ba636
commit 577f730
Show file tree

Hide file tree

Showing 17 changed files with 15 additions and 42 deletions.
diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
@@ -203,7 +203,6 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/grid/utility/StopWatch.hpp
   opm/grid/utility/VelocityInterpolation.hpp
   opm/grid/utility/WachspressCoord.hpp
-  opm/grid/utility/ErrorMacros.hpp
   opm/grid/utility/OpmParserIncludes.hpp
   opm/grid/utility/platform_dependent/disable_warnings.h
   opm/grid/utility/platform_dependent/reenable_warnings.h

diff --git a/opm/grid/CellQuadrature.hpp b/opm/grid/CellQuadrature.hpp
@@ -21,7 +21,7 @@
 #define OPM_CELLQUADRATURE_HEADER_INCLUDED
 
 #include <opm/grid/UnstructuredGrid.h>
-#include <opm/grid/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <algorithm>
 #include <cmath>
 

diff --git a/opm/grid/CpGrid.hpp b/opm/grid/CpGrid.hpp
@@ -42,7 +42,7 @@
 #include <map>
 #include <array>
 #include <unordered_set>
-#include <opm/grid/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 // Warning suppression for Dune includes.
 #include <opm/grid/utility/platform_dependent/disable_warnings.h>

diff --git a/opm/grid/FaceQuadrature.hpp b/opm/grid/FaceQuadrature.hpp
@@ -20,7 +20,7 @@
 #ifndef OPM_FACEQUADRATURE_HEADER_INCLUDED
 #define OPM_FACEQUADRATURE_HEADER_INCLUDED
 
-#include <opm/grid/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/grid/UnstructuredGrid.h>
 #include <cmath>
 

diff --git a/opm/grid/GridManager.cpp b/opm/grid/GridManager.cpp
@@ -25,7 +25,7 @@
 #include <opm/grid/cart_grid.h>
 #include <opm/grid/cornerpoint_grid.h>
 #include <opm/grid/MinpvProcessor.hpp>
-#include <opm/grid/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 #include <opm/grid/utility/OpmParserIncludes.hpp>
 

diff --git a/opm/grid/MinpvProcessor.hpp b/opm/grid/MinpvProcessor.hpp
@@ -21,7 +21,7 @@
 #define OPM_MINPVPROCESSOR_HEADER_INCLUDED
 
 
-#include <opm/grid/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/grid/utility/OpmParserIncludes.hpp>
 
 #include <array>

diff --git a/opm/grid/common/GeometryHelpers.hpp b/opm/grid/common/GeometryHelpers.hpp
@@ -39,7 +39,7 @@
 
 #include <cmath>
 
-#include <opm/grid/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include "Volumes.hpp"
 
 namespace Dune

diff --git a/opm/grid/cpgrid/EntityRep.hpp b/opm/grid/cpgrid/EntityRep.hpp
@@ -69,7 +69,7 @@ namespace Dune
 
 
 //#include <opm/core/utility/SparseTable.hpp>
-#include <opm/grid/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <climits>
 //#include <boost/algorithm/minmax_element.hpp>
 #include <vector>

diff --git a/opm/grid/cpgrid/Geometry.hpp b/opm/grid/cpgrid/Geometry.hpp
@@ -52,7 +52,7 @@
 #include <opm/grid/cpgrid/EntityRep.hpp>
 #include <opm/grid/utility/platform_dependent/reenable_warnings.h>
 
-#include <opm/grid/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 namespace Dune
 {

diff --git a/opm/grid/cpgrid/Indexsets.hpp b/opm/grid/cpgrid/Indexsets.hpp
@@ -37,7 +37,7 @@ along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 #define OPM_INDEXSETS_HEADER
 
 #include <dune/geometry/type.hh>
-#include <opm/grid/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include "GlobalIdMapping.hpp"
 #include "Intersection.hpp"
 

diff --git a/opm/grid/cpgrid/Intersection.hpp b/opm/grid/cpgrid/Intersection.hpp
@@ -41,7 +41,7 @@
 
 #include <dune/grid/common/gridenums.hh>
 
-#include <opm/grid/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 // The next statement is a layering violation: we only #include
 // preprocess.h to get at its "enum face_tag" definition.  Enum

diff --git a/opm/grid/cpgrid/Iterators.hpp b/opm/grid/cpgrid/Iterators.hpp
@@ -38,7 +38,7 @@ along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <dune/grid/common/gridenums.hh>
 #include "PartitionIteratorRule.hpp"
-#include <opm/grid/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 namespace Dune
 {

diff --git a/opm/grid/cpgrid/readSintefLegacyFormat.cpp b/opm/grid/cpgrid/readSintefLegacyFormat.cpp
@@ -40,7 +40,7 @@
 #include <fstream>
 #include <vector>
 
-#include <opm/grid/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include "CpGridData.hpp"
 
 namespace Dune

diff --git a/opm/grid/cpgrid/writeSintefLegacyFormat.cpp b/opm/grid/cpgrid/writeSintefLegacyFormat.cpp
@@ -41,7 +41,7 @@
 #include <fstream>
 #include <vector>
 
-#include <opm/grid/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include "CpGridData.hpp"
 
 namespace Dune

diff --git a/opm/grid/utility/ErrorMacros.hpp b/opm/grid/utility/ErrorMacros.hpp
diff --git a/opm/grid/utility/SparseTable.hpp b/opm/grid/utility/SparseTable.hpp
@@ -39,7 +39,7 @@
 #include <numeric>
 #include <algorithm>
 #include <boost/range/iterator_range.hpp>
-#include <opm/grid/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 #include <ostream>
 

diff --git a/opm/grid/utility/StopWatch.cpp b/opm/grid/utility/StopWatch.cpp
@@ -37,7 +37,7 @@
 #endif
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <opm/grid/utility/StopWatch.hpp>
-#include <opm/grid/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 namespace Opm
 {