Changeset 3677


Ignore:
Timestamp:
May 5, 2015 11:59:21 AM (5 years ago)
Author:
bradbell
Message:

merge to branch: trunk
from repository: https://github.com/coin-or/CppAD
start hash code: bf9459823c22b7b496d632ebde31ca166a1cc81b
end hash code: c97a2e7145825a124c12ec7588a9c80b3a5b4c61

commit c97a2e7145825a124c12ec7588a9c80b3a5b4c61
Author: Brad Bell <bradbell@…>
Date: Tue May 5 08:58:08 2015 -0700

asinh.hpp: Fix bug in case where compiler does not have asinh.
test_one.sh.in: use cmake settings for compiler flags.
test_one.sh.in: use cmake settings for compiler flags.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/cppad/local/asinh.hpp

    r3675 r3677  
    8585template <class Type>
    8686Type asinh_template(const Type &x)
    87 {       return CppAD::log( x + CppAD::sqrt( Type(one) + x * x ) );
     87{       return CppAD::log( x + CppAD::sqrt( Type(1) + x * x ) );
    8888}
    8989
  • trunk/example/test_one.sh.in

    r3664 r3677  
    4040-e "s/.*This line is used by test_one.sh.*/     ok \&= Run( $fun, \"$fun\");/"
    4141#
     42cxxflags='@cppad_cxx_flags@'
    4243if echo "$fun" | grep 'eigen' > /dev/null
    4344then
    44         cxxflags='-g -Wall -ansi -pedantic-errors'
    45 else
    46         cxxflags='-g -Wall -ansi -pedantic-errors -Wshadow'
     45        cxxflags=`echo "$cxxflags" | sed -e 's|-Wshadow||'`
    4746fi
    4847cmd="g++ test_one.cpp $*"
  • trunk/test_more/test_one.sh.in

    r3664 r3677  
    3636#
    3737#
     38cxxflags='@cppad_cxx_flags@'
    3839if echo "$fun" | grep 'eigen' > /dev/null
    3940then
    40         cxxflags='-g -Wall -ansi -pedantic-errors'
    41 else
    42         cxxflags='-g -Wall -ansi -pedantic-errors -Wshadow'
     41        cxxflags=`echo "$cxxflags" | sed -e 's|-Wshadow||'`
    4342fi
    4443cmd="g++ test_one.cpp $*"
Note: See TracChangeset for help on using the changeset viewer.