From 033d5cb76b8021626618cf6d64362b1760068232 Mon Sep 17 00:00:00 2001
From: alankelly <alankelly@live.com>
Date: Fri, 6 Jun 2014 10:24:04 +0200
Subject: [PATCH] minimal table header, code cleaned, extent used instead of
 size for resizing/size comparison

---
 .../external/nt2/nt2_algebra_dispatcher.hpp   |  2 +-
 .../numeric/odeint/external/nt2/nt2_copy.hpp  | 12 ++++++--
 .../odeint/external/nt2/nt2_norm_inf.hpp      |  4 ++-
 .../odeint/external/nt2/nt2_resize.hpp        | 28 ++++++++++++-------
 4 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/include/boost/numeric/odeint/external/nt2/nt2_algebra_dispatcher.hpp b/include/boost/numeric/odeint/external/nt2/nt2_algebra_dispatcher.hpp
index 22005769..7b82a8b3 100644
--- a/include/boost/numeric/odeint/external/nt2/nt2_algebra_dispatcher.hpp
+++ b/include/boost/numeric/odeint/external/nt2/nt2_algebra_dispatcher.hpp
@@ -9,7 +9,7 @@
 #ifndef BOOST_NUMERIC_ODEINT_EXTERNAL_NT2_NT2_ALGEBRA_DISPATCHER_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_EXTERNAL_NT2_NT2_ALGEBRA_DISPATCHER_HPP_INCLUDED
 
-#include <nt2/table.hpp>
+#include <nt2/core/container/table/table.hpp>
 
 #include <boost/numeric/odeint/algebra/vector_space_algebra.hpp>
 #include <boost/numeric/odeint/algebra/algebra_dispatcher.hpp>
diff --git a/include/boost/numeric/odeint/external/nt2/nt2_copy.hpp b/include/boost/numeric/odeint/external/nt2/nt2_copy.hpp
index 12bfbe80..0fd55884 100644
--- a/include/boost/numeric/odeint/external/nt2/nt2_copy.hpp
+++ b/include/boost/numeric/odeint/external/nt2/nt2_copy.hpp
@@ -10,14 +10,20 @@
 #ifndef BOOST_NUMERIC_ODEINT_EXTERNAL_NT2_NT2_COPY_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_EXTERNAL_NT2_NT2_COPY_HPP_INCLUDED
 
-#include <nt2/table.hpp>
+#include <nt2/core/container/table/table.hpp>
+
+#include <boost/numeric/odeint/util/copy.hpp>
 
 namespace boost { namespace numeric { namespace odeint {
 
 template<typename T, typename S>
-struct copy_impl<nt2::container::table<T,S> , nt2::container::table<T,S> >
+struct copy_impl< nt2::container::table<T,S>
+                , nt2::container::table<T,S>
+                >
 {
-  static void copy(const nt2::container::table<T,S> &v1, nt2::container::table<T,S> &v2)
+  static void copy ( const nt2::container::table<T,S> &v1
+                   , nt2::container::table<T,S> &v2
+                   )
   {
     v2 = v1;
   }
diff --git a/include/boost/numeric/odeint/external/nt2/nt2_norm_inf.hpp b/include/boost/numeric/odeint/external/nt2/nt2_norm_inf.hpp
index d44c5cc4..53b4a807 100644
--- a/include/boost/numeric/odeint/external/nt2/nt2_norm_inf.hpp
+++ b/include/boost/numeric/odeint/external/nt2/nt2_norm_inf.hpp
@@ -10,10 +10,12 @@
 #ifndef BOOST_NUMERIC_ODEINT_EXTERNAL_NT2_NT2_NORM_INF_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_EXTERNAL_NT2_NT2_NORM_INF_HPP_INCLUDED
 
-#include <nt2/table.hpp>
+#include <nt2/core/container/table/table.hpp>
 #include <nt2/include/functions/globalmax.hpp>
 #include <nt2/include/functions/abs.hpp>
 
+#include <boost/numeric/odeint/algebra/vector_space_algebra.hpp>
+
 namespace boost { namespace numeric { namespace odeint {
 template<typename T, typename S>
 struct vector_space_norm_inf<nt2::container::table<T,S> >
diff --git a/include/boost/numeric/odeint/external/nt2/nt2_resize.hpp b/include/boost/numeric/odeint/external/nt2/nt2_resize.hpp
index e0d8bb1c..d9c2359c 100644
--- a/include/boost/numeric/odeint/external/nt2/nt2_resize.hpp
+++ b/include/boost/numeric/odeint/external/nt2/nt2_resize.hpp
@@ -1,6 +1,6 @@
 //==============================================================================
 //         Copyright 2014          LRI    UMR 8623 CNRS/Univ Paris Sud XI
-//         Copyright 2014          NUmScale SAS
+//         Copyright 2014          NumScale SAS
 //
 //          Distributed under the Boost Software License, Version 1.0.
 //                 See accompanying file LICENSE.txt or copy at
@@ -9,7 +9,9 @@
 #ifndef BOOST_NUMERIC_ODEINT_EXTERNAL_NT2_NT2_RESIZE_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_EXTERNAL_NT2_NT2_RESIZE_HPP_INCLUDED
 
-#include <nt2/table.hpp>
+#include <nt2/core/container/table/table.hpp>
+
+#include <boost/numeric/odeint/util/same_size.hpp>
 
 namespace boost { namespace numeric { namespace odeint {
 
@@ -21,22 +23,28 @@ struct is_resizeable< nt2::container::table<T,S> >
 };
 
 template<typename T, typename S>
-struct same_size_impl< nt2::container::table<T,S> , nt2::container::table<T,S> >
+struct same_size_impl< nt2::container::table<T,S>
+                     , nt2::container::table<T,S>
+                     >
 {
-  static bool same_size( const nt2::container::table<T,S> &v1 ,
-                         const nt2::container::table<T,S> &v2 )
+  static bool same_size ( const nt2::container::table<T,S> &v1
+                        , const nt2::container::table<T,S> &v2
+                        )
   {
-    return v1.size() == v2.size();
+    return v1.extent() == v2.extent();
   }
 };
 
 template<typename T, typename S>
-struct resize_impl< nt2::container::table<T,S> , nt2::container::table<T,S> >
+struct resize_impl< nt2::container::table<T,S>
+                  , nt2::container::table<T,S>
+                  >
 {
-  static void resize( nt2::container::table<T,S> &v1 ,
-                      const nt2::container::table<T,S> &v2 )
+  static void resize ( nt2::container::table<T,S> &v1
+                     , const nt2::container::table<T,S> &v2
+                     )
   {
-    v1.resize( nt2::of_size(v2.size() ));
+    v1.resize( v2.extent() );
   }
 };
 } } }