From 2202110adeeff582e18179972b07d4268fa69b88 Mon Sep 17 00:00:00 2001
From: "Yuhsiang M. Tsai" <yhmtsai@gmail.com>
Date: Fri, 16 Oct 2020 10:56:44 +0200
Subject: [PATCH] fix omp local header and reorder_factory

---
 include/ginkgo/core/reorder/reordering_base.hpp | 14 +++++++++++---
 omp/reorder/rcm_kernels.cpp                     |  6 +++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/include/ginkgo/core/reorder/reordering_base.hpp b/include/ginkgo/core/reorder/reordering_base.hpp
index b97e9e6c341..e4ee5c9e8f1 100644
--- a/include/ginkgo/core/reorder/reordering_base.hpp
+++ b/include/ginkgo/core/reorder/reordering_base.hpp
@@ -144,9 +144,17 @@ public:                                                                        \
             _factory_name, ::gko::reorder::ReorderingBaseFactory>;             \
         friend class ::gko::enable_parameters_type<_parameters_name##_type,    \
                                                    _factory_name>;             \
-        using ::gko::reorder::EnableDefaultReorderingBaseFactory<              \
-            _factory_name, _reordering_base,                                   \
-            _parameters_name##_type>::EnableDefaultReorderingBaseFactory;      \
+        explicit _factory_name(std::shared_ptr<const ::gko::Executor> exec)    \
+            : ::gko::reorder::EnableDefaultReorderingBaseFactory<              \
+                  _factory_name, _reordering_base, _parameters_name##_type>(   \
+                  std::move(exec))                                             \
+        {}                                                                     \
+        explicit _factory_name(std::shared_ptr<const ::gko::Executor> exec,    \
+                               const _parameters_name##_type &parameters)      \
+            : ::gko::reorder::EnableDefaultReorderingBaseFactory<              \
+                  _factory_name, _reordering_base, _parameters_name##_type>(   \
+                  std::move(exec), parameters)                                 \
+        {}                                                                     \
     };                                                                         \
     friend ::gko::reorder::EnableDefaultReorderingBaseFactory<                 \
         _factory_name, _reordering_base, _parameters_name##_type>;             \
diff --git a/omp/reorder/rcm_kernels.cpp b/omp/reorder/rcm_kernels.cpp
index a5966fddef2..a51c57cef41 100644
--- a/omp/reorder/rcm_kernels.cpp
+++ b/omp/reorder/rcm_kernels.cpp
@@ -54,10 +54,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <ginkgo/core/matrix/sparsity_csr.hpp>
 
 
-#include "components/omp_mutex.hpp"
-#include "components/sort_small.hpp"
 #include "core/base/allocator.hpp"
 #include "core/components/prefix_sum.hpp"
+#include "omp/components/omp_mutex.hpp"
+#include "omp/components/sort_small.hpp"
 
 
 namespace gko {
@@ -872,4 +872,4 @@ GKO_INSTANTIATE_FOR_EACH_INDEX_TYPE(GKO_DECLARE_RCM_GET_PERMUTATION_KERNEL);
 }  // namespace rcm
 }  // namespace omp
 }  // namespace kernels
-}  // namespace gko
\ No newline at end of file
+}  // namespace gko