Changeset 2762


Ignore:
Timestamp:
Mar 1, 2013 9:37:58 AM (7 years ago)
Author:
bradbell
Message:
  1. Advance version number to 20130301.
  2. Add cmake automatic detection for c++11 nullptr feature.
  3. Remove cppad_use_c11_flag from the cmake command line.
  4. Change SPEED_SACADO to CPPAD_SPEED_SACADO (now affects all CppAD usage).
  5. Remove CPPAD_CPP11 and add CPPAD_NULLPTR to autotools configuration.

CMakeLists.txt: if present, remove c++11 flag from Sacado speed test build.

Location:
trunk
Files:
37 edited

Legend:

Unmodified
Added
Removed
  • trunk/AUTHORS

    r2754 r2762  
    22             ===========================================
    33
    4 To date, 2013-02-20, Bradley M. Bell is the sole author of CppAD.
     4To date, 2013-03-01, Bradley M. Bell is the sole author of CppAD.
    55While Bradley M. Bell worked for the University of Washington during
    66the development of CppAD, the following are also true:
  • trunk/CMakeLists.txt

    r2754 r2762  
    1717
    1818# cppad_version is used by set_version.sh to get the version number.
    19 SET(cppad_version      "20130220" )
     19SET(cppad_version      "20130301" )
    2020SET(cppad_url          "http://www.coin-or.org/CppAD" )
    2121SET(cppad_description  "Differentiation of C++ Algorithms" )
     
    101101# -Wshadow is left out.
    102102MACRO(add_cppad_cxx_flags target_name)
     103        SET(no_c11    NO)
     104        IF( ${target_name} STREQUAL speed_sacado )
     105                SET(no_c11 YES)
     106        ENDIF( ${target_name} STREQUAL speed_sacado )
     107        #
    103108        SET(no_shadow NO)
    104109        IF( ${target_name} STREQUAL example_eigen )
    105110                SET(no_shadow YES)
    106111        ENDIF( ${target_name} STREQUAL example_eigen )
     112        #
    107113        IF( ${target_name} STREQUAL test_more_eigen )
    108114                SET(no_shadow YES)
    109115        ENDIF( ${target_name} STREQUAL test_more_eigen )
     116        #
    110117        IF( ${target_name} STREQUAL speed_fadbad )
    111118                SET(no_shadow YES)
    112119        ENDIF( ${target_name} STREQUAL speed_fadbad )
    113         IF( no_shadow )
    114                 SET(cxx_flags "${cppad_cxx_flags_skip_Wshadow}")
    115         ELSE( no_shadow )
    116                 SET(cxx_flags "${cppad_cxx_flags}")
    117         ENDIF( no_shadow )
    118         # sacado does not compile under c++11
    119         IF( NOT ( ${target_name} STREQUAL speed_sacado) )
    120                 IF( cppad_c11_flag )
    121                         IF( cxx_flags )
    122                                 SET(cxx_flags "${cppad_c11_flag} ${cxx_flags}" )
    123                         ELSE( cxx_flags )
    124                                 SET(cxx_flags "${cppad_c11_flag}" )
    125                         ENDIF( cxx_flags )
    126                 ENDIF( cppad_c11_flag )
    127         ENDIF( NOT ( ${target_name} STREQUAL speed_sacado) )
     120        #
     121        IF( no_c11 )
     122                SET(cxx_flags "${cppad_cxx_flags_skip_c11}")
     123        ELSE( no_c11 )
     124                IF( no_shadow )
     125                        SET(cxx_flags "${cppad_cxx_flags_skip_Wshadow}")
     126                ELSE( no_shadow )
     127                        SET(cxx_flags "${cppad_cxx_flags}")
     128                ENDIF( no_shadow )
     129        ENDIF( no_c11 )
    128130        IF( cxx_flags )
    129131                SET_TARGET_PROPERTIES(
     
    163165)
    164166# -----------------------------------------------------------------------------
    165 # cppad_use_c11_flag
    166 command_line_arg(cppad_c11_flag NOTFOUND STRING
    167         "If this flag is present, it gets get c++11 complinace from compiler"
    168 )
    169 # -----------------------------------------------------------------------------
    170167# cppad_cxx_flags
    171168command_line_arg(cppad_cxx_flags NOTFOUND STRING
    172         "extra flags used with cppad source (besides debug, release, c11 flags)"
     169        "extra flags used with cppad source (besides debug and release flags)"
    173170)
    174171# -----------------------------------------------------------------------------
     
    212209        ENDIF( NOT cppad_install_libdir )
    213210ENDFOREACH(dir ${cmake_install_libdirs})
     211# -----------------------------------------------------------------------------
     212# cppad_cxx_flags_skip_c11
     213STRING(REGEX REPLACE
     214        "(.*)-std=c[+][+]11(.*)"         "\\1 \\2"
     215        cppad_cxx_flags_skip_c11 "${cppad_cxx_flags}"
     216)
     217MESSAGE(STATUS "cppad_cxx_flags_skip_c11 = ${cppad_cxx_flags_skip_c11}")
    214218# -----------------------------------------------------------------------------
    215219# cppad_cxx_flags_skip_Wshadow
  • trunk/bin/check_all.sh

    r2754 r2762  
    118118        fi
    119119done
    120 cmake_args="$cmake_args -D cppad_c11_flag='-std=c++11'"
    121 cmake_args="$cmake_args -D cppad_cxx_flags='-Wall -pedantic-errors -Wshadow'"
     120cmake_args="$cmake_args -D cppad_cxx_flags=\
     121'-Wall -pedantic-errors -std=c++11 -Wshadow'"
    122122cmake_args="$cmake_args -D cppad_documentation=YES"
    123123#
  • trunk/compare_c/makefile.in

    r2755 r2762  
    105105CPP = @CPP@
    106106CPPAD_BOOSTVECTOR = @CPPAD_BOOSTVECTOR@
    107 CPPAD_CPP11 = @CPPAD_CPP11@
    108107CPPAD_CPPADVECTOR = @CPPAD_CPPADVECTOR@
    109108CPPAD_EIGENVECTOR = @CPPAD_EIGENVECTOR@
     
    113112CPPAD_IPOPT_LIBS = @CPPAD_IPOPT_LIBS@
    114113CPPAD_MAX_NUM_THREADS_DEFAULT = @CPPAD_MAX_NUM_THREADS_DEFAULT@
     114CPPAD_NULLPTR = @CPPAD_NULLPTR@
    115115CPPAD_SIZE_T_SAME_UNSIGNED_INT = @CPPAD_SIZE_T_SAME_UNSIGNED_INT@
    116116CPPAD_STDVECTOR = @CPPAD_STDVECTOR@
  • trunk/configure

    r2754 r2762  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.68 for cppad 20130220.
     3# Generated by GNU Autoconf 2.68 for cppad 20130301.
    44#
    55# Report bugs to <cppad@list.coin-or.org>.
     
    561561PACKAGE_NAME='cppad'
    562562PACKAGE_TARNAME='cppad'
    563 PACKAGE_VERSION='20130220'
    564 PACKAGE_STRING='cppad 20130220'
     563PACKAGE_VERSION='20130301'
     564PACKAGE_STRING='cppad 20130301'
    565565PACKAGE_BUGREPORT='cppad@list.coin-or.org'
    566566PACKAGE_URL=''
     
    688688CFLAGS
    689689CC
    690 CPPAD_CPP11
     690CPPAD_NULLPTR
    691691CPPAD_TAPE_ID_TYPE
    692692TAPE_ID_TYPE
     
    13641364  # This message is too long to be a string in the A/UX 3.1 sh.
    13651365  cat <<_ACEOF
    1366 \`configure' configures cppad 20130220 to adapt to many kinds of systems.
     1366\`configure' configures cppad 20130301 to adapt to many kinds of systems.
    13671367
    13681368Usage: $0 [OPTION]... [VAR=VALUE]...
     
    14301430if test -n "$ac_init_help"; then
    14311431  case $ac_init_help in
    1432      short | recursive ) echo "Configuration of cppad 20130220:";;
     1432     short | recursive ) echo "Configuration of cppad 20130301:";;
    14331433   esac
    14341434  cat <<\_ACEOF
     
    15561556if $ac_init_version; then
    15571557  cat <<\_ACEOF
    1558 cppad configure 20130220
     1558cppad configure 20130301
    15591559generated by GNU Autoconf 2.68
    15601560
     
    21802180running configure, to aid debugging if configure makes a mistake.
    21812181
    2182 It was created by cppad $as_me 20130220, which was
     2182It was created by cppad $as_me 20130301, which was
    21832183generated by GNU Autoconf 2.68.  Invocation command line was
    21842184
     
    31693169$as_echo "$as_me: ********** End Checking Command Line arguments ***************" >&6;}
    31703170
    3171 CPPAD_CPP11=0
     3171CPPAD_NULLPTR=0
    31723172
    31733173
     
    49884988# Define the identity of the package.
    49894989 PACKAGE='cppad'
    4990  VERSION='20130220'
     4990 VERSION='20130301'
    49914991
    49924992
     
    80408040# values after options handling.
    80418041ac_log="
    8042 This file was extended by cppad $as_me 20130220, which was
     8042This file was extended by cppad $as_me 20130301, which was
    80438043generated by GNU Autoconf 2.68.  Invocation command line was
    80448044
     
    80978097ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    80988098ac_cs_version="\\
    8099 cppad config.status 20130220
     8099cppad config.status 20130301
    81008100configured by $0, generated by GNU Autoconf 2.68,
    81018101  with options \\"\$ac_cs_config\\"
  • trunk/configure.ac

    r2754 r2762  
    1313dnl Process this file with autoconf to produce a configure script.
    1414dnl   package   version              bug-report
    15 AC_INIT(cppad, 20130220, cppad@list.coin-or.org)
     15AC_INIT(cppad, 20130301, cppad@list.coin-or.org)
    1616
    1717dnl By defalut disable maintainer mode when running configure;
     
    419419
    420420dnl auto-tools version cannot use c++11 compiler
    421 AC_SUBST(CPPAD_CPP11, 0)
     421dnl so supress corresponding features
     422AC_SUBST(CPPAD_NULLPTR, 0)
    422423
    423424dnl Determine if size_t has same size as unsigned int
  • trunk/cppad/CMakeLists.txt

    r2754 r2762  
    2828# command line arguments
    2929#
     30#
    3031# cppad_testvector
    3132command_line_arg(cppad_testvector cppad STRING
     
    5152"type used to identify variables on one tape, size must be <= sizeof(size_t)"
    5253)
    53 # ----------------------------------------------------------------------------
    54 # CPPAD_CPP11
    55 #
    56 IF( cppad_c11_flag )
    57         SET(CPPAD_CPP11  1)
    58 ELSE( cppad_c11_flag )
    59         SET(CPPAD_CPP11  0)
    60 ENDIF( cppad_c11_flag )
    6154# -----------------------------------------------------------------------------
    6255# CPPAD_INTERNAL_SPARSE_SET
     
    10497        ENDIF( NOT eigen_prefix )
    10598ENDIF( CPPAD_EIGENVECTOR )
     99
     100# -----------------------------------------------------------------------------
     101# CPPAD_NULLPTR
     102#
     103# CHECK_CXX_SOURCE_RUNS(source variable)
     104SET(CMAKE_REQUIRED_INCLUDES  "")
     105SET(CMAKE_REQUIRED_LIBRARIES "")
     106SET(CMAKE_REQUIRED_FLAGS     ${cppad_cxx_flags})
     107SET(source "
     108int main(void)
     109{       char *c = nullptr;
     110        return 0;
     111}" )
     112CHECK_CXX_SOURCE_RUNS("${source}" nullptr_ok)
     113IF( nullptr_ok )
     114        SET(CPPAD_NULLPTR 1)
     115ELSE( nullptr_ok )
     116        SET(CPPAD_NULLPTR 0)
     117ENDIF( nullptr_ok )
     118MESSAGE(STATUS "CPPAD_NULLPTR = ${CPPAD_NULLPTR}" )
    106119
    107120# -----------------------------------------------------------------------------
  • trunk/cppad/configure.hpp.in

    r2754 r2762  
    4848
    4949/*!
    50 def CPPAD_CPP11
    51 is this a c++11 compliant compiler, 1 (yes) or 0 (no).
    52 CPPAD_NO_CPP11 is used by the Sacado speed test to surpress using c++11
    53 because Sacado does not support it.
     50def CPPAD_NULLPTR
     51Does this compiler support the a c++11 null-pointer constant nullptr
     52(true = 1, false = 0).
     53
     54The Sacado speed tests surpress using the c++11 flag because Sacado
     55does not support it. The cmake test for nullptr does not supress using c++11,
     56so we fall back to the c++98 standard for the Sacado case.
    5457*/
    55 # ifdef CPPAD_NO_CPP11
    56 # define CPPAD_CPP11 0
     58# ifdef CPPAD_SPEED_SACADO
     59# define CPPAD_NULLPTR 0
    5760# else
    58 # define CPPAD_CPP11 @CPPAD_CPP11@
     61# define CPPAD_NULLPTR @CPPAD_NULLPTR@
    5962# endif
    6063 
  • trunk/cppad/local/define.hpp

    r2754 r2762  
    9292*/
    9393# ifndef CPPAD_NULL
    94 # if CPPAD_CPP11
     94# if CPPAD_NULLPTR
    9595# define CPPAD_NULL     nullptr 
    9696# else
  • trunk/cppad_ipopt/example/makefile.in

    r2755 r2762  
    108108CPP = @CPP@
    109109CPPAD_BOOSTVECTOR = @CPPAD_BOOSTVECTOR@
    110 CPPAD_CPP11 = @CPPAD_CPP11@
    111110CPPAD_CPPADVECTOR = @CPPAD_CPPADVECTOR@
    112111CPPAD_EIGENVECTOR = @CPPAD_EIGENVECTOR@
     
    116115CPPAD_IPOPT_LIBS = @CPPAD_IPOPT_LIBS@
    117116CPPAD_MAX_NUM_THREADS_DEFAULT = @CPPAD_MAX_NUM_THREADS_DEFAULT@
     117CPPAD_NULLPTR = @CPPAD_NULLPTR@
    118118CPPAD_SIZE_T_SAME_UNSIGNED_INT = @CPPAD_SIZE_T_SAME_UNSIGNED_INT@
    119119CPPAD_STDVECTOR = @CPPAD_STDVECTOR@
  • trunk/cppad_ipopt/speed/makefile.in

    r2755 r2762  
    109109CPP = @CPP@
    110110CPPAD_BOOSTVECTOR = @CPPAD_BOOSTVECTOR@
    111 CPPAD_CPP11 = @CPPAD_CPP11@
    112111CPPAD_CPPADVECTOR = @CPPAD_CPPADVECTOR@
    113112CPPAD_EIGENVECTOR = @CPPAD_EIGENVECTOR@
     
    117116CPPAD_IPOPT_LIBS = @CPPAD_IPOPT_LIBS@
    118117CPPAD_MAX_NUM_THREADS_DEFAULT = @CPPAD_MAX_NUM_THREADS_DEFAULT@
     118CPPAD_NULLPTR = @CPPAD_NULLPTR@
    119119CPPAD_SIZE_T_SAME_UNSIGNED_INT = @CPPAD_SIZE_T_SAME_UNSIGNED_INT@
    120120CPPAD_STDVECTOR = @CPPAD_STDVECTOR@
  • trunk/cppad_ipopt/src/makefile.in

    r2755 r2762  
    142142CPP = @CPP@
    143143CPPAD_BOOSTVECTOR = @CPPAD_BOOSTVECTOR@
    144 CPPAD_CPP11 = @CPPAD_CPP11@
    145144CPPAD_CPPADVECTOR = @CPPAD_CPPADVECTOR@
    146145CPPAD_EIGENVECTOR = @CPPAD_EIGENVECTOR@
     
    150149CPPAD_IPOPT_LIBS = @CPPAD_IPOPT_LIBS@
    151150CPPAD_MAX_NUM_THREADS_DEFAULT = @CPPAD_MAX_NUM_THREADS_DEFAULT@
     151CPPAD_NULLPTR = @CPPAD_NULLPTR@
    152152CPPAD_SIZE_T_SAME_UNSIGNED_INT = @CPPAD_SIZE_T_SAME_UNSIGNED_INT@
    153153CPPAD_STDVECTOR = @CPPAD_STDVECTOR@
  • trunk/cppad_ipopt/test/makefile.in

    r2755 r2762  
    104104CPP = @CPP@
    105105CPPAD_BOOSTVECTOR = @CPPAD_BOOSTVECTOR@
    106 CPPAD_CPP11 = @CPPAD_CPP11@
    107106CPPAD_CPPADVECTOR = @CPPAD_CPPADVECTOR@
    108107CPPAD_EIGENVECTOR = @CPPAD_EIGENVECTOR@
     
    112111CPPAD_IPOPT_LIBS = @CPPAD_IPOPT_LIBS@
    113112CPPAD_MAX_NUM_THREADS_DEFAULT = @CPPAD_MAX_NUM_THREADS_DEFAULT@
     113CPPAD_NULLPTR = @CPPAD_NULLPTR@
    114114CPPAD_SIZE_T_SAME_UNSIGNED_INT = @CPPAD_SIZE_T_SAME_UNSIGNED_INT@
    115115CPPAD_STDVECTOR = @CPPAD_STDVECTOR@
  • trunk/doc.omh

    r2754 r2762  
    5151$comment bin/version assumes that : follows cppad version number here$$
    5252$section
    53 cppad-20130220: A Package for Differentiation of C++ Algorithms
     53cppad-20130301: A Package for Differentiation of C++ Algorithms
    5454$$
    5555
  • trunk/example/ipopt_solve/makefile.in

    r2755 r2762  
    103103CPP = @CPP@
    104104CPPAD_BOOSTVECTOR = @CPPAD_BOOSTVECTOR@
    105 CPPAD_CPP11 = @CPPAD_CPP11@
    106105CPPAD_CPPADVECTOR = @CPPAD_CPPADVECTOR@
    107106CPPAD_EIGENVECTOR = @CPPAD_EIGENVECTOR@
     
    111110CPPAD_IPOPT_LIBS = @CPPAD_IPOPT_LIBS@
    112111CPPAD_MAX_NUM_THREADS_DEFAULT = @CPPAD_MAX_NUM_THREADS_DEFAULT@
     112CPPAD_NULLPTR = @CPPAD_NULLPTR@
    113113CPPAD_SIZE_T_SAME_UNSIGNED_INT = @CPPAD_SIZE_T_SAME_UNSIGNED_INT@
    114114CPPAD_STDVECTOR = @CPPAD_STDVECTOR@
  • trunk/example/makefile.in

    r2755 r2762  
    201201CPP = @CPP@
    202202CPPAD_BOOSTVECTOR = @CPPAD_BOOSTVECTOR@
    203 CPPAD_CPP11 = @CPPAD_CPP11@
    204203CPPAD_CPPADVECTOR = @CPPAD_CPPADVECTOR@
    205204CPPAD_EIGENVECTOR = @CPPAD_EIGENVECTOR@
     
    209208CPPAD_IPOPT_LIBS = @CPPAD_IPOPT_LIBS@
    210209CPPAD_MAX_NUM_THREADS_DEFAULT = @CPPAD_MAX_NUM_THREADS_DEFAULT@
     210CPPAD_NULLPTR = @CPPAD_NULLPTR@
    211211CPPAD_SIZE_T_SAME_UNSIGNED_INT = @CPPAD_SIZE_T_SAME_UNSIGNED_INT@
    212212CPPAD_STDVECTOR = @CPPAD_STDVECTOR@
  • trunk/introduction/exp_apx/makefile.in

    r2755 r2762  
    108108CPP = @CPP@
    109109CPPAD_BOOSTVECTOR = @CPPAD_BOOSTVECTOR@
    110 CPPAD_CPP11 = @CPPAD_CPP11@
    111110CPPAD_CPPADVECTOR = @CPPAD_CPPADVECTOR@
    112111CPPAD_EIGENVECTOR = @CPPAD_EIGENVECTOR@
     
    116115CPPAD_IPOPT_LIBS = @CPPAD_IPOPT_LIBS@
    117116CPPAD_MAX_NUM_THREADS_DEFAULT = @CPPAD_MAX_NUM_THREADS_DEFAULT@
     117CPPAD_NULLPTR = @CPPAD_NULLPTR@
    118118CPPAD_SIZE_T_SAME_UNSIGNED_INT = @CPPAD_SIZE_T_SAME_UNSIGNED_INT@
    119119CPPAD_STDVECTOR = @CPPAD_STDVECTOR@
  • trunk/introduction/get_started/makefile.in

    r2755 r2762  
    9898CPP = @CPP@
    9999CPPAD_BOOSTVECTOR = @CPPAD_BOOSTVECTOR@
    100 CPPAD_CPP11 = @CPPAD_CPP11@
    101100CPPAD_CPPADVECTOR = @CPPAD_CPPADVECTOR@
    102101CPPAD_EIGENVECTOR = @CPPAD_EIGENVECTOR@
     
    106105CPPAD_IPOPT_LIBS = @CPPAD_IPOPT_LIBS@
    107106CPPAD_MAX_NUM_THREADS_DEFAULT = @CPPAD_MAX_NUM_THREADS_DEFAULT@
     107CPPAD_NULLPTR = @CPPAD_NULLPTR@
    108108CPPAD_SIZE_T_SAME_UNSIGNED_INT = @CPPAD_SIZE_T_SAME_UNSIGNED_INT@
    109109CPPAD_STDVECTOR = @CPPAD_STDVECTOR@
  • trunk/makefile.in

    r2755 r2762  
    185185CPP = @CPP@
    186186CPPAD_BOOSTVECTOR = @CPPAD_BOOSTVECTOR@
    187 CPPAD_CPP11 = @CPPAD_CPP11@
    188187CPPAD_CPPADVECTOR = @CPPAD_CPPADVECTOR@
    189188CPPAD_EIGENVECTOR = @CPPAD_EIGENVECTOR@
     
    193192CPPAD_IPOPT_LIBS = @CPPAD_IPOPT_LIBS@
    194193CPPAD_MAX_NUM_THREADS_DEFAULT = @CPPAD_MAX_NUM_THREADS_DEFAULT@
     194CPPAD_NULLPTR = @CPPAD_NULLPTR@
    195195CPPAD_SIZE_T_SAME_UNSIGNED_INT = @CPPAD_SIZE_T_SAME_UNSIGNED_INT@
    196196CPPAD_STDVECTOR = @CPPAD_STDVECTOR@
  • trunk/multi_thread/makefile.in

    r2755 r2762  
    130130CPP = @CPP@
    131131CPPAD_BOOSTVECTOR = @CPPAD_BOOSTVECTOR@
    132 CPPAD_CPP11 = @CPPAD_CPP11@
    133132CPPAD_CPPADVECTOR = @CPPAD_CPPADVECTOR@
    134133CPPAD_EIGENVECTOR = @CPPAD_EIGENVECTOR@
     
    138137CPPAD_IPOPT_LIBS = @CPPAD_IPOPT_LIBS@
    139138CPPAD_MAX_NUM_THREADS_DEFAULT = @CPPAD_MAX_NUM_THREADS_DEFAULT@
     139CPPAD_NULLPTR = @CPPAD_NULLPTR@
    140140CPPAD_SIZE_T_SAME_UNSIGNED_INT = @CPPAD_SIZE_T_SAME_UNSIGNED_INT@
    141141CPPAD_STDVECTOR = @CPPAD_STDVECTOR@
  • trunk/multi_thread/test_multi/makefile.in

    r2755 r2762  
    9898CPP = @CPP@
    9999CPPAD_BOOSTVECTOR = @CPPAD_BOOSTVECTOR@
    100 CPPAD_CPP11 = @CPPAD_CPP11@
    101100CPPAD_CPPADVECTOR = @CPPAD_CPPADVECTOR@
    102101CPPAD_EIGENVECTOR = @CPPAD_EIGENVECTOR@
     
    106105CPPAD_IPOPT_LIBS = @CPPAD_IPOPT_LIBS@
    107106CPPAD_MAX_NUM_THREADS_DEFAULT = @CPPAD_MAX_NUM_THREADS_DEFAULT@
     107CPPAD_NULLPTR = @CPPAD_NULLPTR@
    108108CPPAD_SIZE_T_SAME_UNSIGNED_INT = @CPPAD_SIZE_T_SAME_UNSIGNED_INT@
    109109CPPAD_STDVECTOR = @CPPAD_STDVECTOR@
  • trunk/omh/install/cmake.omh

    r2754 r2762  
    9797        -D sacado_prefix=%sacado_prefix%                             \
    9898        \
    99         -D cppad_c11_flag=%cppad_c11_flag%                         \
    10099        -D cppad_cxx_flags=%cppad_cxx_flags%                         \
    101100        -D cppad_documentation=%cppad_documentation%                 \
     
    222221$rref sacado_prefix$$
    223222$tend
    224 
    225 $head cppad_c11_flag$$
    226 $index c++11, compile flag$$
    227 $index compile, c++11 flag$$
    228 $index flags, c++11 compile$$
    229 This specifies the compiler flag that gives c++11 compliance.
    230 For example, if you are using $code g++$$ you could specify
    231 $codep
    232         -D cppad_c11_flag='-std=c++11'
    233 $$
    234 If you have partial compliance, using this flag may or many not work.
    235 If you get an error because the compiler only partially implements this
    236 standard, omit this flag.
    237 There is once exception to this run,
    238 Sacado does not support c++11 so this flags is suppressed
    239 when compiling the routines used by $cref speed_sacado$$.
    240223
    241224$head cppad_cxx_flags$$
  • trunk/omh/install/download.omh

    r2754 r2762  
    6161
    6262$table
    63 EPL License $pre  $$ $cnext $href%cppad-20130220.epl.tgz%$$
     63EPL License $pre  $$ $cnext $href%cppad-20130301.epl.tgz%$$
    6464$rnext
    65 GPL License $pre  $$ $cnext $href%cppad-20130220.gpl.tgz%$$
     65GPL License $pre  $$ $cnext $href%cppad-20130301.gpl.tgz%$$
    6666$tend
    6767
  • trunk/omh/whats_new/whats_new_13.omh

    r2756 r2762  
    3535assist you in learning about changes between various versions of CppAD.
    3636
     37$head 03-01$$
     38Remove the $cref cmake$$ $code cppad_c11_flag$$ and instead
     39automatically detect if the compiler supports specific c++11 features.
     40
    3741$head 02-27$$
    3842The test $cref limits.cpp$$ was failing during testing of Fedora-19; see
     
    4953$lnext
    5054An option to specify that the compiler supports c++11 constructs,
    51 $cref/cppad_c11_flag/cmake/cppad_c11_flag/$$, was added
     55$code cppad_c11_flag$$, was added
    5256to the $code cmake$$ command line.
    5357$lend
  • trunk/print_for/makefile.in

    r2755 r2762  
    9898CPP = @CPP@
    9999CPPAD_BOOSTVECTOR = @CPPAD_BOOSTVECTOR@
    100 CPPAD_CPP11 = @CPPAD_CPP11@
    101100CPPAD_CPPADVECTOR = @CPPAD_CPPADVECTOR@
    102101CPPAD_EIGENVECTOR = @CPPAD_EIGENVECTOR@
     
    106105CPPAD_IPOPT_LIBS = @CPPAD_IPOPT_LIBS@
    107106CPPAD_MAX_NUM_THREADS_DEFAULT = @CPPAD_MAX_NUM_THREADS_DEFAULT@
     107CPPAD_NULLPTR = @CPPAD_NULLPTR@
    108108CPPAD_SIZE_T_SAME_UNSIGNED_INT = @CPPAD_SIZE_T_SAME_UNSIGNED_INT@
    109109CPPAD_STDVECTOR = @CPPAD_STDVECTOR@
  • trunk/speed/adolc/makefile.in

    r2755 r2762  
    106106CPP = @CPP@
    107107CPPAD_BOOSTVECTOR = @CPPAD_BOOSTVECTOR@
    108 CPPAD_CPP11 = @CPPAD_CPP11@
    109108CPPAD_CPPADVECTOR = @CPPAD_CPPADVECTOR@
    110109CPPAD_EIGENVECTOR = @CPPAD_EIGENVECTOR@
     
    114113CPPAD_IPOPT_LIBS = @CPPAD_IPOPT_LIBS@
    115114CPPAD_MAX_NUM_THREADS_DEFAULT = @CPPAD_MAX_NUM_THREADS_DEFAULT@
     115CPPAD_NULLPTR = @CPPAD_NULLPTR@
    116116CPPAD_SIZE_T_SAME_UNSIGNED_INT = @CPPAD_SIZE_T_SAME_UNSIGNED_INT@
    117117CPPAD_STDVECTOR = @CPPAD_STDVECTOR@
  • trunk/speed/cppad/makefile.in

    r2755 r2762  
    106106CPP = @CPP@
    107107CPPAD_BOOSTVECTOR = @CPPAD_BOOSTVECTOR@
    108 CPPAD_CPP11 = @CPPAD_CPP11@
    109108CPPAD_CPPADVECTOR = @CPPAD_CPPADVECTOR@
    110109CPPAD_EIGENVECTOR = @CPPAD_EIGENVECTOR@
     
    114113CPPAD_IPOPT_LIBS = @CPPAD_IPOPT_LIBS@
    115114CPPAD_MAX_NUM_THREADS_DEFAULT = @CPPAD_MAX_NUM_THREADS_DEFAULT@
     115CPPAD_NULLPTR = @CPPAD_NULLPTR@
    116116CPPAD_SIZE_T_SAME_UNSIGNED_INT = @CPPAD_SIZE_T_SAME_UNSIGNED_INT@
    117117CPPAD_STDVECTOR = @CPPAD_STDVECTOR@
  • trunk/speed/double/makefile.in

    r2755 r2762  
    102102CPP = @CPP@
    103103CPPAD_BOOSTVECTOR = @CPPAD_BOOSTVECTOR@
    104 CPPAD_CPP11 = @CPPAD_CPP11@
    105104CPPAD_CPPADVECTOR = @CPPAD_CPPADVECTOR@
    106105CPPAD_EIGENVECTOR = @CPPAD_EIGENVECTOR@
     
    110109CPPAD_IPOPT_LIBS = @CPPAD_IPOPT_LIBS@
    111110CPPAD_MAX_NUM_THREADS_DEFAULT = @CPPAD_MAX_NUM_THREADS_DEFAULT@
     111CPPAD_NULLPTR = @CPPAD_NULLPTR@
    112112CPPAD_SIZE_T_SAME_UNSIGNED_INT = @CPPAD_SIZE_T_SAME_UNSIGNED_INT@
    113113CPPAD_STDVECTOR = @CPPAD_STDVECTOR@
  • trunk/speed/example/makefile.in

    r2755 r2762  
    104104CPP = @CPP@
    105105CPPAD_BOOSTVECTOR = @CPPAD_BOOSTVECTOR@
    106 CPPAD_CPP11 = @CPPAD_CPP11@
    107106CPPAD_CPPADVECTOR = @CPPAD_CPPADVECTOR@
    108107CPPAD_EIGENVECTOR = @CPPAD_EIGENVECTOR@
     
    112111CPPAD_IPOPT_LIBS = @CPPAD_IPOPT_LIBS@
    113112CPPAD_MAX_NUM_THREADS_DEFAULT = @CPPAD_MAX_NUM_THREADS_DEFAULT@
     113CPPAD_NULLPTR = @CPPAD_NULLPTR@
    114114CPPAD_SIZE_T_SAME_UNSIGNED_INT = @CPPAD_SIZE_T_SAME_UNSIGNED_INT@
    115115CPPAD_STDVECTOR = @CPPAD_STDVECTOR@
  • trunk/speed/fadbad/makefile.in

    r2755 r2762  
    102102CPP = @CPP@
    103103CPPAD_BOOSTVECTOR = @CPPAD_BOOSTVECTOR@
    104 CPPAD_CPP11 = @CPPAD_CPP11@
    105104CPPAD_CPPADVECTOR = @CPPAD_CPPADVECTOR@
    106105CPPAD_EIGENVECTOR = @CPPAD_EIGENVECTOR@
     
    110109CPPAD_IPOPT_LIBS = @CPPAD_IPOPT_LIBS@
    111110CPPAD_MAX_NUM_THREADS_DEFAULT = @CPPAD_MAX_NUM_THREADS_DEFAULT@
     111CPPAD_NULLPTR = @CPPAD_NULLPTR@
    112112CPPAD_SIZE_T_SAME_UNSIGNED_INT = @CPPAD_SIZE_T_SAME_UNSIGNED_INT@
    113113CPPAD_STDVECTOR = @CPPAD_STDVECTOR@
  • trunk/speed/main.cpp

    r2506 r2762  
    11/* $Id$ */
    22/* --------------------------------------------------------------------------
    3 CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-12 Bradley M. Bell
     3CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-13 Bradley M. Bell
    44
    55CppAD is distributed under multiple licenses. This distribution is under
     
    4141# define AD_PACKAGE "profile"
    4242# endif
    43 # ifdef SPEED_SACADO
     43// Sacado is a special case because is does not support c+11;
     44// Hence the setting of this symbol affects all programs that use CppAD.
     45# ifdef CPPAD_SPEED_SACADO
    4446# define AD_PACKAGE "sacado"
    4547# endif
  • trunk/speed/profile/makefile.in

    r2755 r2762  
    110110CPP = @CPP@
    111111CPPAD_BOOSTVECTOR = @CPPAD_BOOSTVECTOR@
    112 CPPAD_CPP11 = @CPPAD_CPP11@
    113112CPPAD_CPPADVECTOR = @CPPAD_CPPADVECTOR@
    114113CPPAD_EIGENVECTOR = @CPPAD_EIGENVECTOR@
     
    118117CPPAD_IPOPT_LIBS = @CPPAD_IPOPT_LIBS@
    119118CPPAD_MAX_NUM_THREADS_DEFAULT = @CPPAD_MAX_NUM_THREADS_DEFAULT@
     119CPPAD_NULLPTR = @CPPAD_NULLPTR@
    120120CPPAD_SIZE_T_SAME_UNSIGNED_INT = @CPPAD_SIZE_T_SAME_UNSIGNED_INT@
    121121CPPAD_STDVECTOR = @CPPAD_STDVECTOR@
  • trunk/speed/sacado/CMakeLists.txt

    r2754 r2762  
    2727# and below. This command can be used to add any flags, but it was originally
    2828# intended to add preprocessor definitions.
    29 #
    30 # sacado does not support c++11 so make sure it does not get used
    31 ADD_DEFINITIONS("-DSPEED_SACADO -DRAD_AUTO_AD_Const -DCPPAD_NO_CPP11")
     29ADD_DEFINITIONS("-DCPPAD_SPEED_SACADO -DRAD_AUTO_AD_Const")
    3230
    3331# Local include directories to search (not in package_prefix/includdir)
     
    5149
    5250# List of libraries to be linked into the specified target
    53 TARGET_LINK_LIBRARIES(speed_sacado speed_src sacado )
     51TARGET_LINK_LIBRARIES(speed_sacado speed_src sacado teuchos)
    5452
    5553# Add the check_speed_sacado target
  • trunk/speed/sacado/makefile.am

    r2572 r2762  
    11# $Id$
    22# -----------------------------------------------------------------------------
    3 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-12 Bradley M. Bell
     3# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-13 Bradley M. Bell
    44#
    55# CppAD is distributed under multiple licenses. This distribution is under
     
    2525#
    2626# BEGIN OPTIMIZE
    27 AM_CXXFLAGS   = -O2 -DNDEBUG -DSPEED_SACADO \
     27AM_CXXFLAGS   = -O2 -DNDEBUG -DCPPAD_SPEED_SACADO \
    2828        -DRAD_EQ_ALIAS -DRAD_AUTO_AD_Const $(CXX_FLAGS)
    2929# END OPTIMIZE
    3030#
    3131# BEGIN DEBUG
    32 # AM_CXXFLAGS   = -g $(CXX_FLAGS) $(CXX_FLAGS) -DSPEED_SACADO -DRAD_AUTO_AD_Const
     32# AM_CXXFLAGS   = -g $(CXX_FLAGS) $(CXX_FLAGS) -DCPPAD_SPEED_SACADO -DRAD_AUTO_AD_Const
    3333# END DEBUG
    3434#
  • trunk/speed/sacado/makefile.in

    r2755 r2762  
    102102CPP = @CPP@
    103103CPPAD_BOOSTVECTOR = @CPPAD_BOOSTVECTOR@
    104 CPPAD_CPP11 = @CPPAD_CPP11@
    105104CPPAD_CPPADVECTOR = @CPPAD_CPPADVECTOR@
    106105CPPAD_EIGENVECTOR = @CPPAD_EIGENVECTOR@
     
    110109CPPAD_IPOPT_LIBS = @CPPAD_IPOPT_LIBS@
    111110CPPAD_MAX_NUM_THREADS_DEFAULT = @CPPAD_MAX_NUM_THREADS_DEFAULT@
     111CPPAD_NULLPTR = @CPPAD_NULLPTR@
    112112CPPAD_SIZE_T_SAME_UNSIGNED_INT = @CPPAD_SIZE_T_SAME_UNSIGNED_INT@
    113113CPPAD_STDVECTOR = @CPPAD_STDVECTOR@
     
    125125# $Id$
    126126# -----------------------------------------------------------------------------
    127 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-12 Bradley M. Bell
     127# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-13 Bradley M. Bell
    128128#
    129129# CppAD is distributed under multiple licenses. This distribution is under
     
    252252#
    253253# BEGIN OPTIMIZE
    254 AM_CXXFLAGS = -O2 -DNDEBUG -DSPEED_SACADO \
     254AM_CXXFLAGS = -O2 -DNDEBUG -DCPPAD_SPEED_SACADO \
    255255        -DRAD_EQ_ALIAS -DRAD_AUTO_AD_Const $(CXX_FLAGS)
    256256
     
    258258#
    259259# BEGIN DEBUG
    260 # AM_CXXFLAGS   = -g $(CXX_FLAGS) $(CXX_FLAGS) -DSPEED_SACADO -DRAD_AUTO_AD_Const
     260# AM_CXXFLAGS   = -g $(CXX_FLAGS) $(CXX_FLAGS) -DCPPAD_SPEED_SACADO -DRAD_AUTO_AD_Const
    261261# END DEBUG
    262262#
  • trunk/speed/src/makefile.in

    r2755 r2762  
    105105CPP = @CPP@
    106106CPPAD_BOOSTVECTOR = @CPPAD_BOOSTVECTOR@
    107 CPPAD_CPP11 = @CPPAD_CPP11@
    108107CPPAD_CPPADVECTOR = @CPPAD_CPPADVECTOR@
    109108CPPAD_EIGENVECTOR = @CPPAD_EIGENVECTOR@
     
    113112CPPAD_IPOPT_LIBS = @CPPAD_IPOPT_LIBS@
    114113CPPAD_MAX_NUM_THREADS_DEFAULT = @CPPAD_MAX_NUM_THREADS_DEFAULT@
     114CPPAD_NULLPTR = @CPPAD_NULLPTR@
    115115CPPAD_SIZE_T_SAME_UNSIGNED_INT = @CPPAD_SIZE_T_SAME_UNSIGNED_INT@
    116116CPPAD_STDVECTOR = @CPPAD_STDVECTOR@
  • trunk/test_more/makefile.in

    r2756 r2762  
    169169CPP = @CPP@
    170170CPPAD_BOOSTVECTOR = @CPPAD_BOOSTVECTOR@
    171 CPPAD_CPP11 = @CPPAD_CPP11@
    172171CPPAD_CPPADVECTOR = @CPPAD_CPPADVECTOR@
    173172CPPAD_EIGENVECTOR = @CPPAD_EIGENVECTOR@
     
    177176CPPAD_IPOPT_LIBS = @CPPAD_IPOPT_LIBS@
    178177CPPAD_MAX_NUM_THREADS_DEFAULT = @CPPAD_MAX_NUM_THREADS_DEFAULT@
     178CPPAD_NULLPTR = @CPPAD_NULLPTR@
    179179CPPAD_SIZE_T_SAME_UNSIGNED_INT = @CPPAD_SIZE_T_SAME_UNSIGNED_INT@
    180180CPPAD_STDVECTOR = @CPPAD_STDVECTOR@
Note: See TracChangeset for help on using the changeset viewer.