From 0ef45b13550922fd1b793bef8a4ddcaf6f046069 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <klinkjak@fjfi.cvut.cz>
Date: Tue, 5 Feb 2019 22:05:11 +0100
Subject: [PATCH] NDArray: moved SizesHolderStaticSizePrinter and
SizesHolderSizePrinter into the implementation namespace
---
src/TNL/Containers/ndarray/SizesHolder.h | 46 ++++++++++++------------
1 file changed, 22 insertions(+), 24 deletions(-)
diff --git a/src/TNL/Containers/ndarray/SizesHolder.h b/src/TNL/Containers/ndarray/SizesHolder.h
index 69a032c7f8..5b6e52f5fa 100644
--- a/src/TNL/Containers/ndarray/SizesHolder.h
+++ b/src/TNL/Containers/ndarray/SizesHolder.h
@@ -123,6 +123,26 @@ protected:
}
};
+template< std::size_t dimension >
+struct SizesHolderStaticSizePrinter
+{
+ template< typename SizesHolder >
+ static void exec( std::ostream& str, const SizesHolder& holder )
+ {
+ str << holder.template getStaticSize< dimension >() << ", ";
+ }
+};
+
+template< std::size_t dimension >
+struct SizesHolderSizePrinter
+{
+ template< typename SizesHolder >
+ static void exec( std::ostream& str, const SizesHolder& holder )
+ {
+ str << holder.template getSize< dimension >() << ", ";
+ }
+};
+
} // namespace __ndarray_impl
@@ -181,36 +201,14 @@ public:
};
-template< std::size_t dimension >
-struct SizesHolderStaticSizePrinter
-{
- template< typename Index,
- std::size_t... sizes >
- static void exec( std::ostream& str, const SizesHolder< Index, sizes... >& holder )
- {
- str << holder.template getStaticSize< dimension >() << ", ";
- }
-};
-
-template< std::size_t dimension >
-struct SizesHolderSizePrinter
-{
- template< typename Index,
- std::size_t... sizes >
- static void exec( std::ostream& str, const SizesHolder< Index, sizes... >& holder )
- {
- str << holder.template getSize< dimension >() << ", ";
- }
-};
-
template< typename Index,
std::size_t... sizes >
std::ostream& operator<<( std::ostream& str, const SizesHolder< Index, sizes... >& holder )
{
str << "SizesHolder< ";
- TemplateStaticFor< std::size_t, 0, sizeof...(sizes) - 1, SizesHolderStaticSizePrinter >::execHost( str, holder );
+ TemplateStaticFor< std::size_t, 0, sizeof...(sizes) - 1, __ndarray_impl::SizesHolderStaticSizePrinter >::execHost( str, holder );
str << holder.template getStaticSize< sizeof...(sizes) - 1 >() << " >( ";
- TemplateStaticFor< std::size_t, 0, sizeof...(sizes) - 1, SizesHolderSizePrinter >::execHost( str, holder );
+ TemplateStaticFor< std::size_t, 0, sizeof...(sizes) - 1, __ndarray_impl::SizesHolderSizePrinter >::execHost( str, holder );
str << holder.template getSize< sizeof...(sizes) - 1 >() << " )";
return str;
}
--
GitLab