mirror of
https://github.com/boostorg/odeint.git
synced 2025-05-09 15:14:02 +00:00
removing old include from external test jamfiles, adding nounused local typedef warning, adding newline to toolset.jam.patch
This commit is contained in:
parent
9473d7f067
commit
87dae441ef
4
Jamroot
4
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"
|
||||
;
|
||||
|
||||
|
@ -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 );
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/*
|
||||
|
@ -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
|
||||
;
|
||||
|
||||
|
@ -11,7 +11,6 @@ use-project boost : $(BOOST_ROOT) ;
|
||||
project gmp
|
||||
: requirements
|
||||
<library>/boost/test//boost_unit_test_framework
|
||||
<include>../../../../..
|
||||
;
|
||||
|
||||
|
||||
|
@ -11,7 +11,6 @@ use-project boost : $(BOOST_ROOT) ;
|
||||
project
|
||||
: requirements
|
||||
<library>/boost/test//boost_unit_test_framework
|
||||
<include>../../../../..
|
||||
;
|
||||
|
||||
|
||||
|
@ -11,7 +11,6 @@ use-project boost : $(BOOST_ROOT) ;
|
||||
project
|
||||
: requirements
|
||||
<library>/boost/test//boost_unit_test_framework
|
||||
<include>../../../../..
|
||||
;
|
||||
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -58,4 +58,4 @@ index b5defd5..a942cd9 100644
|
||||
+ }
|
||||
}
|
||||
else
|
||||
{
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user