From 105a4762454b4eb72adb28d0962bbb1267847b27 Mon Sep 17 00:00:00 2001
From: Chuck Atkins <chuck.atkins@kitware.com>
Date: Tue, 18 Apr 2017 17:02:48 -0400
Subject: [PATCH] Moved remaining private headers

---
 include/{ADIOS_CPP.h => adios2.h}             |  0
 include/{ADIOS_C.h => adios2_c.h}             |  0
 include/{selection => core}/Selection.h       | 19 +++++++------------
 .../SelectionBoundingBox.h                    |  7 +++++--
 include/{selection => core}/SelectionPoints.h |  7 ++++---
 include/core/VariableBase.h                   |  2 +-
 .../external}/external/adios_selection.h      |  0
 {include => source}/external/json.hpp         |  0
 8 files changed, 17 insertions(+), 18 deletions(-)
 rename include/{ADIOS_CPP.h => adios2.h} (100%)
 rename include/{ADIOS_C.h => adios2_c.h} (100%)
 rename include/{selection => core}/Selection.h (82%)
 rename include/{selection => core}/SelectionBoundingBox.h (91%)
 rename include/{selection => core}/SelectionPoints.h (93%)
 rename {include => source/external}/external/adios_selection.h (100%)
 rename {include => source}/external/json.hpp (100%)

diff --git a/include/ADIOS_CPP.h b/include/adios2.h
similarity index 100%
rename from include/ADIOS_CPP.h
rename to include/adios2.h
diff --git a/include/ADIOS_C.h b/include/adios2_c.h
similarity index 100%
rename from include/ADIOS_C.h
rename to include/adios2_c.h
diff --git a/include/selection/Selection.h b/include/core/Selection.h
similarity index 82%
rename from include/selection/Selection.h
rename to include/core/Selection.h
index 70d4c8314..e138ac80d 100644
--- a/include/selection/Selection.h
+++ b/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
diff --git a/include/selection/SelectionBoundingBox.h b/include/core/SelectionBoundingBox.h
similarity index 91%
rename from include/selection/SelectionBoundingBox.h
rename to include/core/SelectionBoundingBox.h
index b110fd96e..fb991720c 100644
--- a/include/selection/SelectionBoundingBox.h
+++ b/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;
diff --git a/include/selection/SelectionPoints.h b/include/core/SelectionPoints.h
similarity index 93%
rename from include/selection/SelectionPoints.h
rename to include/core/SelectionPoints.h
index 13fa951cb..981460290 100644
--- a/include/selection/SelectionPoints.h
+++ b/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;
diff --git a/include/core/VariableBase.h b/include/core/VariableBase.h
index 49bb98a1e..e4d1a63d7 100644
--- a/include/core/VariableBase.h
+++ b/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
 {
diff --git a/include/external/adios_selection.h b/source/external/external/adios_selection.h
similarity index 100%
rename from include/external/adios_selection.h
rename to source/external/external/adios_selection.h
diff --git a/include/external/json.hpp b/source/external/json.hpp
similarity index 100%
rename from include/external/json.hpp
rename to source/external/json.hpp
-- 
GitLab