Merge pull request #1400 from BorisMansencal/pragmapop

correct pragma pop
DGtal-team · Mar 9, 2019 · 21f72bc · 21f72bc
2 parents 091bbfe + 3a4e050
commit 21f72bc
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -66,8 +66,9 @@
     [#1389](https://github.com/DGtal-team/DGtal/pull/1389))
   - Fix compilation and adding debug version for the generated file with Visual Studio
     (Raphael Lenain, [#1395](https://github.com/DGtal-team/DGtal/pull/1395))
-
-
+  - Correct pragma pop in ITK related files
+    (Boris Mansencal, [#1400](https://github.com/DGtal-team/DGtal/pull/1400))
+
 - *Base*
   - Fixing wrong members in PredicateCombiner (David Coeurjolly,
     [#1321](https://github.com/DGtal-team/DGtal/pull/1321))

diff --git a/src/DGtal/images/ImageContainerByITKImage.h b/src/DGtal/images/ImageContainerByITKImage.h
@@ -65,8 +65,8 @@
 #pragma clang diagnostic pop
 #endif
 #if defined(__GNUG__)
-#endif
 #pragma GCC diagnostic pop
+#endif
 //////////////////////////////////////////////////////////////////////////////
 
 namespace DGtal

diff --git a/src/DGtal/io/readers/DicomReader.ih b/src/DGtal/io/readers/DicomReader.ih
@@ -57,8 +57,8 @@
 #pragma clang diagnostic pop
 #endif
 #if defined(__GNUG__)
-#endif
 #pragma GCC diagnostic pop
+#endif
 //////////////////////////////////////////////////////////////////////////////
 
 

diff --git a/src/DGtal/io/readers/ITKReader.h b/src/DGtal/io/readers/ITKReader.h
@@ -60,8 +60,8 @@
 #pragma clang diagnostic pop
 #endif
 #if defined(__GNUG__)
-#endif
 #pragma GCC diagnostic pop
+#endif
 
 namespace DGtal
 {

diff --git a/src/DGtal/io/readers/ITKReader.ih b/src/DGtal/io/readers/ITKReader.ih
@@ -46,8 +46,8 @@
 #pragma clang diagnostic pop
 #endif
 #if defined(__GNUG__)
-#endif
 #pragma GCC diagnostic pop
+#endif
 
 namespace DGtal {
 

diff --git a/src/DGtal/io/writers/ITKWriter.ih b/src/DGtal/io/writers/ITKWriter.ih
@@ -42,8 +42,8 @@
 #pragma clang diagnostic pop
 #endif
 #if defined(__GNUG__)
-#endif
 #pragma GCC diagnostic pop
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // IMPLEMENTATION of inline methods.

diff --git a/tests/images/testITKImage.cpp b/tests/images/testITKImage.cpp
@@ -49,8 +49,8 @@
 #pragma clang diagnostic pop
 #endif
 #if defined(__GNUG__)
-#endif
 #pragma GCC diagnostic pop
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////