Fix after rebase

Author: franzpoeschel

include/openPMD/IO/ADIOS/macros.hpp

@@ -21,25 +21,28 @@
 #define openPMD_HAVE_ADIOS2_BP5 0
 #endif
 
-namespace detail
-{
-template <typename Variable, typename SFINAE = void>
-struct CanTheMemorySelectionBeReset
+namespace openPMD
 {
-    static constexpr bool value = false;
-};
-
-template <typename Variable>
-struct CanTheMemorySelectionBeReset<
-    Variable,
-    decltype(std::declval<Variable>().SetMemorySelection())>
+namespace detail
 {
-    static constexpr bool value = true;
-};
+    template <typename Variable, typename SFINAE = void>
+    struct CanTheMemorySelectionBeReset
+    {
+        static constexpr bool value = false;
+    };
+
+    template <typename Variable>
+    struct CanTheMemorySelectionBeReset<
+        Variable,
+        decltype(std::declval<Variable>().SetMemorySelection())>
+    {
+        static constexpr bool value = true;
+    };
 } // namespace detail
 
 constexpr bool CanTheMemorySelectionBeReset =
     detail::CanTheMemorySelectionBeReset<adios2::Variable<int>>::value;
+} // namespace openPMD
 
 #else
 

src/IO/ADIOS/ADIOS2File.cpp

@@ -115,7 +115,7 @@ void WriteDataset::call(ADIOS2File &ba, detail::BufferedPut &bp)
                 ba.getEngine().Put(var, ptr);
                 if (bp.param.memorySelection.has_value())
                 {
-                    if constexpr (CanTheMemorySelectionBeReset)
+                    if constexpr (openPMD::CanTheMemorySelectionBeReset)
                     {
                         var.SetMemorySelection();
                     }
@@ -197,7 +197,7 @@ struct RunUniquePtrPut
         ba.getEngine().Put(var, ptr);
         if (bufferedPut.memorySelection.has_value())
         {
-            if constexpr (CanTheMemorySelectionBeReset)
+            if constexpr (openPMD::CanTheMemorySelectionBeReset)
             {
                 var.SetMemorySelection();
             }

test/Files_ParallelIO/read_variablebased_randomaccess.cpp

@@ -7,7 +7,7 @@
 
 #include <catch2/catch.hpp>
 
-#if openPMD_HAVE_ADIOS2 && openPMD_HAVE_MPI && openPMD_HAS_ADIOS_2_9
+#if openPMD_HAVE_ADIOS2 && openPMD_HAVE_MPI
 #include <adios2.h>
 #include <mpi.h>