Moved remaining private headers

include/selection/Selection.h → include/core/Selection.h

@@ -33,29 +33,24 @@
 #ifndef __ADIOS_SELECTION_H__
 #define __ADIOS_SELECTION_H__
 
-/// \cond EXCLUDE_FROM_DOXYGEN
-#include "external/adios_selection.h"
-#include <stdint.h>
-/// \endcond
-
 namespace adios
 {
 
-/*************************/
-/* Types used in the API */
-/*************************/
 /* Type of selection */
 enum class SelectionType
 {
     // Contiguous block of data defined by offsets and counts in each
     // dimension
-    BoundingBox = ADIOS_SELECTION_BOUNDINGBOX,
+    BoundingBox,
+ 
     // List of individual points
-    Points = ADIOS_SELECTION_POINTS,
+    Points,
+
     // Selection of an individual block written by a writer process
-    WriteBlock = ADIOS_SELECTION_WRITEBLOCK,
+    WriteBlock,
+
     // Let the method decide what to return
-    Auto = ADIOS_SELECTION_AUTO
+    Auto
 };
 
 class Selection

include/selection/SelectionBoundingBox.h → include/core/SelectionBoundingBox.h

@@ -10,7 +10,9 @@
 #include <cstdint>
 /// \endcond
 
-#include "selection/Selection.h"
+#include <vector>
+
+#include "Selection.h"
 
 namespace adios
 {
@@ -27,7 +29,8 @@ public:
     : Selection(SelectionType::BoundingBox), m_Start(start), m_Count(count)
     {
     }
-    ~SelectionBoundingBox(){};
+
+    ~SelectionBoundingBox() = default;
 
     std::vector<std::uint64_t> m_Start;
     std::vector<std::uint64_t> m_Count;

include/selection/SelectionPoints.h → include/core/SelectionPoints.h

@@ -10,8 +10,9 @@
 #include <cstdint>
 /// \endcond
 
-#include "selection/Selection.h"
-#include "selection/SelectionBoundingBox.h"
+#include <vector>
+
+#include "Selection.h"
 
 namespace adios
 {
@@ -40,7 +41,7 @@ public:
     {
     }
 
-    ~SelectionPoints(){};
+    virtual ~SelectionPoints() = default;
 
     const std::size_t m_Ndim;
     const std::size_t m_Npoints;

include/core/VariableBase.h

@@ -21,7 +21,7 @@
 
 #include "functions/adiosFunctions.h" //GetTotalSize, DimsToCSV, ConvertUint64VectorToSizetVector
 #include "functions/adiosTemplates.h"       //GetType<T>
-#include "selection/SelectionBoundingBox.h" //Selection
+#include "SelectionBoundingBox.h" //Selection
 
 namespace adios
 {