Fix ADIOS1 header conflicts with ADIOS1

source/adios2/ADIOS.cpp

@@ -8,6 +8,8 @@
  *      Author: William F Godoy
  */
 
+#include <adios_read_v2.h>
+
 #include "ADIOS.h"
 #include "ADIOS.tcc"
 

source/adios2/core/Selection.h

@@ -30,8 +30,9 @@
  *   the application does not need to retrieve the selection to work on the read
  * data.
  */
-#ifndef __ADIOS_SELECTION_H__
-#define __ADIOS_SELECTION_H__
+
+#ifndef ADIOS2_CORE_SELECTION_H_
+#define ADIOS2_CORE_SELECTION_H_
 
 #include "adios2/ADIOSConfig.h"
 
@@ -64,4 +65,4 @@ public:
 
 } // namespace adios
 
-#endif /*__ADIOS_SELECTION_H__*/
+#endif /* ADIOS2_CORE_SELECTION_H_ */

source/adios2/core/SelectionBoundingBox.h

@@ -3,12 +3,10 @@
  * accompanying file Copyright.txt for details.
  */
 
-#ifndef __ADIOS_SELECTION_BOUNDINGBOX_H__
-#define __ADIOS_SELECTION_BOUNDINGBOX_H__
+#ifndef ADIOS2_CORE_SELECTIONBOUNDINGBOX_H_
+#define ADIOS2_CORE_SELECTIONBOUNDINGBOX_H_
 
-/// \cond EXCLUDE_FROM_DOXYGEN
 #include <cstdint>
-/// \endcond
 
 #include <vector>
 
@@ -31,12 +29,10 @@ public:
     {
     }
 
-    ~SelectionBoundingBox() = default;
-
     std::vector<std::uint64_t> m_Start;
     std::vector<std::uint64_t> m_Count;
 };
 
 } // namespace adios
 
-#endif /*__ADIOS_SELECTION_BOUNDINGBOX_H__*/
+#endif /* ADIOS2_CORE_SELECTIONBOUNDINGBOX_H_ */

source/adios2/core/SelectionPoints.h

@@ -3,8 +3,8 @@
  * accompanying file Copyright.txt for details.
  */
 
-#ifndef __ADIOS_SELECTION_POINTS_H__
-#define __ADIOS_SELECTION_POINTS_H__
+#ifndef ADIOS2_CORE_SELECTIONPOINTS_H_
+#define ADIOS2_CORE_SELECTIONPOINTS_H_
 
 /// \cond EXCLUDE_FROM_DOXYGEN
 #include <cstdint>
@@ -54,4 +54,4 @@ public:
 
 } // namespace adios
 
-#endif /*__ADIOS_SELECTION_POINTS_H__*/
+#endif /* ADIOS2_CORE_SELECTIONPOINTS_H_ */

source/adios2/engine/adios1/ADIOS1Reader.h

@@ -15,12 +15,12 @@
 
 #include <iostream> //this must go away
 
+#include <adios_read_v2.h>
+
 #include "adios2/ADIOSConfig.h"
 #include "adios2/capsule/heap/STLVector.h"
 #include "adios2/core/Engine.h"
 
-#include <adios_read_v2.h>
-
 namespace adios
 {
 

source/adios2/engine/adios1/ADIOS1Writer.h

@@ -13,14 +13,14 @@
 #ifndef ADIOS1WRITER_H_
 #define ADIOS1WRITER_H_
 
+#include <adios.h>
+
 #include "adios2/ADIOSConfig.h"
 #include "adios2/core/Engine.h"
 
 namespace adios
 {
 
-#include <adios.h> // this is adios 1.x header file
-
 class ADIOS1Writer : public Engine
 {
 

source/adios2/mpidummy.h

@@ -3,8 +3,8 @@
  * accompanying file Copyright.txt for details.
  */
 
-#ifndef __MPI_DUMMY_H__
-#define __MPI_DUMMY_H__
+#ifndef ADIOS2_MPIDUMMY_H_
+#define ADIOS2_MPIDUMMY_H_
 
 /*
    A dummy MPI 'implementation' for the BP READ API, to have an MPI-free version
@@ -119,6 +119,6 @@ int MPI_Get_processor_name(char *name, int *resultlen);
 
 double MPI_Wtime();
 
-} // end namespace
+} // end namespace adios
 
-#endif
+#endif /* ADIOS2_MPIDUMMY_H_ */