From 87dae441efccea10526c63b6f5bfbf5712a4d009 Mon Sep 17 00:00:00 2001
From: Karsten Ahnert <karsten.ahnert@gmx.de>
Date: Sat, 16 Aug 2014 14:12:08 +0200
Subject: [PATCH] removing old include from external test jamfiles, adding
 nounused local typedef warning, adding newline to toolset.jam.patch

---
 Jamroot                                              | 4 ++--
 include/boost/numeric/odeint/integrate/integrate.hpp | 9 +++++++++
 test_external/eigen/Jamfile.v2                       | 2 --
 test_external/gmp/Jamfile.v2                         | 1 -
 test_external/gsl/Jamfile.v2                         | 1 -
 test_external/mkl/Jamfile.v2                         | 1 -
 test_external/mpi/Jamfile.v2                         | 1 -
 test_external/mtl4/Jamfile.v2                        | 1 -
 test_external/nt2/Jamfile.v2                         | 1 -
 test_external/vexcl/Jamfile.v2                       | 1 -
 toolset.jam.patch                                    | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Jamroot b/Jamroot
index 09f5384e..48384e3c 100644
--- a/Jamroot
+++ b/Jamroot
@@ -14,8 +14,8 @@ path-constant BOOST_ROOT : [ os.environ BOOST_ROOT ] ;
 project 
    : requirements 
      <include>include&&$(BOOST_ROOT)
-     <toolset>gcc:<cxxflags>"-Wall -Wno-unused-parameter -Wno-unused-variable -Wno-unknown-pragmas"
-     <toolset>clang:<cxxflags>"-Wall -Wextra -Wno-unused-function -Wno-unused-parameter -Wno-unknown-pragmas"
+     <toolset>gcc:<cxxflags>"-Wall -Wno-unused-parameter -Wno-unused-variable -Wno-unknown-pragmas -Wno-unused-local-typedefs"
+     <toolset>clang:<cxxflags>"-Wall -Wextra -Wno-unused-function -Wno-unused-parameter -Wno-unknown-pragmas -Wno-unused-local-typedefs"
      <toolset>intel:<cxxflags>"-ipo"
    ;
 
diff --git a/include/boost/numeric/odeint/integrate/integrate.hpp b/include/boost/numeric/odeint/integrate/integrate.hpp
index 6cb96c0f..c02278a2 100644
--- a/include/boost/numeric/odeint/integrate/integrate.hpp
+++ b/include/boost/numeric/odeint/integrate/integrate.hpp
@@ -48,6 +48,15 @@ integrate( System system , State &start_state , Time start_time , Time end_time
     return integrate_adaptive( stepper_type() , system , start_state , start_time , end_time , dt , observer );
 }
 
+template< class System , class State , class Time , class Observer , class Value >
+size_t 
+integrate( System system , State &start_state , Time start_time , Time end_time , Time dt , Observer observer )
+{
+    typedef controlled_runge_kutta< runge_kutta_dopri5< State , Value , State , Time > > stepper_type;
+    return integrate_adaptive( stepper_type() , system , start_state , start_time , end_time , dt , observer );
+}
+
+
 
 
 /*
diff --git a/test_external/eigen/Jamfile.v2 b/test_external/eigen/Jamfile.v2
index 47b3a881..b508a0ea 100644
--- a/test_external/eigen/Jamfile.v2
+++ b/test_external/eigen/Jamfile.v2
@@ -17,10 +17,8 @@ project
     : requirements
       <library>/boost/test//boost_unit_test_framework
       <define>BOOST_ALL_NO_LIB=1
-      <include>../../../../..
       <include>$(EIGEN_ROOT)
       <link>static
-      <toolset>clang:<cxxflags>-Wno-unused-variable
       # <cxxflags>-D_SCL_SECURE_NO_WARNINGS
     ;
 
diff --git a/test_external/gmp/Jamfile.v2 b/test_external/gmp/Jamfile.v2
index e4e60328..f0e6af02 100644
--- a/test_external/gmp/Jamfile.v2
+++ b/test_external/gmp/Jamfile.v2
@@ -11,7 +11,6 @@ use-project boost : $(BOOST_ROOT) ;
 project gmp
     : requirements
       <library>/boost/test//boost_unit_test_framework
-      <include>../../../../..
     ;
     
     
diff --git a/test_external/gsl/Jamfile.v2 b/test_external/gsl/Jamfile.v2
index 73595d30..086edf6e 100644
--- a/test_external/gsl/Jamfile.v2
+++ b/test_external/gsl/Jamfile.v2
@@ -11,7 +11,6 @@ use-project boost : $(BOOST_ROOT) ;
 project
     : requirements
       <library>/boost/test//boost_unit_test_framework
-      <include>../../../../..
     ;
     
     
diff --git a/test_external/mkl/Jamfile.v2 b/test_external/mkl/Jamfile.v2
index 168d69c4..f585fa83 100644
--- a/test_external/mkl/Jamfile.v2
+++ b/test_external/mkl/Jamfile.v2
@@ -11,7 +11,6 @@ use-project boost : $(BOOST_ROOT) ;
 project
     : requirements
       <library>/boost/test//boost_unit_test_framework
-      <include>../../../../..
     ;
     
     
diff --git a/test_external/mpi/Jamfile.v2 b/test_external/mpi/Jamfile.v2
index bb14ff57..0a02bccf 100644
--- a/test_external/mpi/Jamfile.v2
+++ b/test_external/mpi/Jamfile.v2
@@ -15,7 +15,6 @@ project
       <library>/boost//mpi
       <link>static
       <define>BOOST_ALL_NO_LIB=1
-      <include>../../../../..
     ;
 
 # mpi-test name : source : req : np=1 2 3 4 7 8 13 17
diff --git a/test_external/mtl4/Jamfile.v2 b/test_external/mtl4/Jamfile.v2
index c85c97fb..3a8481ab 100644
--- a/test_external/mtl4/Jamfile.v2
+++ b/test_external/mtl4/Jamfile.v2
@@ -15,7 +15,6 @@ MTL4_INCLUDE = /home/mario/MTL4 ;
 project
     : requirements 
       <library>/boost/test//boost_unit_test_framework
-      <include>../../../../..
       <include>$(MTL4_INCLUDE)
       <define>BOOST_ALL_NO_LIB=1
       <link>static
diff --git a/test_external/nt2/Jamfile.v2 b/test_external/nt2/Jamfile.v2
index 9f9b142f..26763da6 100644
--- a/test_external/nt2/Jamfile.v2
+++ b/test_external/nt2/Jamfile.v2
@@ -26,7 +26,6 @@ project
   : requirements
     <library>$(BOOST_ROOT)/boost/test/included/unit_test_framework.hpp
     <define>BOOST_ALL_NO_LIB=1
-    <include>../../../../..
     <include>$(NT2_ROOT_PATH)/include/
     <link>static
     <toolset>gcc:<cxxflags>-DBOOST_SIMD_NO_STRICT_ALIASING
diff --git a/test_external/vexcl/Jamfile.v2 b/test_external/vexcl/Jamfile.v2
index dec9da63..9b76b430 100644
--- a/test_external/vexcl/Jamfile.v2
+++ b/test_external/vexcl/Jamfile.v2
@@ -17,7 +17,6 @@ project
     : requirements
       <library>/boost/test//boost_unit_test_framework
       <define>BOOST_ALL_NO_LIB=1
-      <include>../../../../..
       <include>$(VEXCL_INCLUDE)
       <include>$(OPENCL_INCLUDE)
       <cxxflags>-std=c++0x
diff --git a/toolset.jam.patch b/toolset.jam.patch
index 50268e72..dca997d5 100644
--- a/toolset.jam.patch
+++ b/toolset.jam.patch
@@ -58,4 +58,4 @@ index b5defd5..a942cd9 100644
 +        }
      }
      else
-     {
\ No newline at end of file
+     {