diff --git a/appendix/whats_new/2024.xrst b/appendix/whats_new/2024.xrst index 361225d84..1e6f81883 100644 --- a/appendix/whats_new/2024.xrst +++ b/appendix/whats_new/2024.xrst @@ -30,7 +30,7 @@ Release Notes for 2024 mm-dd ***** -03-14 +03-15 ===== #. The user's choice of :ref:`ta_parallel_setup@in_parallel` routine was not being called properly in some cases. This has been fixed. diff --git a/bin/check_all.sh b/bin/check_all.sh index 060b7d686..e36a2b135 100755 --- a/bin/check_all.sh +++ b/bin/check_all.sh @@ -10,20 +10,20 @@ then fi if [ "$1" != 'mixed' ] && [ "$1" != 'debug' ] && [ "$1" != 'release' ] then - echo 'bin/check_all.sh: (mixed|debug|release) [verbose]' + echo 'bin/check_all.sh: (mixed|debug|release) [verbose_make]' exit 1 fi -if [ "$2" != '' ] && [ "$2" != 'verbose' ] +if [ "$2" != '' ] && [ "$2" != 'verbose_make' ] then - echo 'bin/check_all.sh: (mixed|debug|release) [verbose]' + echo 'bin/check_all.sh: (mixed|debug|release) [verbose_make]' exit 1 fi build_type="$1" -if [ "$2" == 'verbose' ] +if [ "$2" == 'verbose_make' ] then - verbose='--verbose' + verbose_make='--verbose_make' else - verbose='' + verbose_make='' fi # ----------------------------------------------------------------------------- # bash function that echos and executes a command @@ -135,7 +135,7 @@ then else if [ "$build_type" != 'mixed' ] then - echo 'bin/run_cmake.sh: build_type program error' + echo 'bin/check_all.sh: build_type not debug release or mixed' exit 1 fi random_01 debug_which @@ -251,9 +251,14 @@ then echo_log_eval bin/run_configure.sh $standard fi else - builder='ninja' + if [ "$verbose_name" != '' ] + then + builder='make' + else + builder='ninja' + fi echo_log_eval bin/run_cmake.sh \ - $verbose \ + $verbose_make \ --profile_speed \ $compiler \ $standard \ diff --git a/include/cppad/utility/check_simple_vector.hpp b/include/cppad/utility/check_simple_vector.hpp index b2c5e73da..dc07fc1d7 100644 --- a/include/cppad/utility/check_simple_vector.hpp +++ b/include/cppad/utility/check_simple_vector.hpp @@ -102,9 +102,18 @@ so *S* is not the same as *T* . # include # include +// CPPAD_CHECK_SIMPLE_VECTOR +# ifndef NDEBUG +# define CPPAD_CHECK_SIMPLE_VECTOR 1 +# elif CPPAD_DEBUG_AND_RELEASE +# define CPPAD_CHECK_SIMPLE_VECTOR 1 +# else +# define CPPAD_CHECK_SIMPLE_VECTOR 0 +# endif + namespace CppAD { -# ifdef NDEBUG +# if ! CPPAD_CHECK_SIMPLE_VECTOR template inline void CheckSimpleVector(const Scalar& x, const Scalar& y) { } @@ -119,7 +128,7 @@ namespace CppAD { struct ok_if_S_same_as_T { T value; }; template - void CheckSimpleVector(const Scalar& x, const Scalar& y) + inline void CheckSimpleVector(const Scalar& x, const Scalar& y) { // // count static size_t count = 0; @@ -194,8 +203,8 @@ namespace CppAD { Scalar y; // use assignment and not constructor - x = 0; - y = 1; + x = Scalar(0); + y = Scalar(1); CheckSimpleVector(x, y); } @@ -204,4 +213,5 @@ namespace CppAD { } // end namespace CppAD +# undef CPPAD_CHECK_SIMPLE_VECTOR # endif