Changeset 2763


Ignore:
Timestamp:
Mar 2, 2013 7:46:44 AM (7 years ago)
Author:
bradbell
Message:

Change CPPAD_NULLPTR -> CPPAD_HAS_NULLPTR

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r2762 r2763  
    420420dnl auto-tools version cannot use c++11 compiler
    421421dnl so supress corresponding features
    422 AC_SUBST(CPPAD_NULLPTR, 0)
     422AC_SUBST(CPPAD_HAS_NULLPTR, 0)
    423423
    424424dnl Determine if size_t has same size as unsigned int
  • trunk/cppad/CMakeLists.txt

    r2762 r2763  
    9999
    100100# -----------------------------------------------------------------------------
    101 # CPPAD_NULLPTR
     101# CPPAD_HAS_NULLPTR
    102102#
    103103# CHECK_CXX_SOURCE_RUNS(source variable)
     
    112112CHECK_CXX_SOURCE_RUNS("${source}" nullptr_ok)
    113113IF( nullptr_ok )
    114         SET(CPPAD_NULLPTR 1)
     114        SET(CPPAD_HAS_NULLPTR 1)
    115115ELSE( nullptr_ok )
    116         SET(CPPAD_NULLPTR 0)
     116        SET(CPPAD_HAS_NULLPTR 0)
    117117ENDIF( nullptr_ok )
    118 MESSAGE(STATUS "CPPAD_NULLPTR = ${CPPAD_NULLPTR}" )
     118MESSAGE(STATUS "CPPAD_HAS_NULLPTR = ${CPPAD_HAS_NULLPTR}" )
    119119
    120120# -----------------------------------------------------------------------------
  • trunk/cppad/configure.hpp.in

    r2762 r2763  
    4848
    4949/*!
    50 def CPPAD_NULLPTR
     50def CPPAD_HAS_NULLPTR
    5151Does this compiler support the a c++11 null-pointer constant nullptr
    5252(true = 1, false = 0).
     
    5757*/
    5858# ifdef CPPAD_SPEED_SACADO
    59 # define CPPAD_NULLPTR 0
     59# define CPPAD_HAS_NULLPTR 0
    6060# else
    61 # define CPPAD_NULLPTR @CPPAD_NULLPTR@
     61# define CPPAD_HAS_NULLPTR @CPPAD_HAS_NULLPTR@
    6262# endif
    6363 
  • trunk/cppad/local/define.hpp

    r2762 r2763  
    9292*/
    9393# ifndef CPPAD_NULL
    94 # if CPPAD_NULLPTR
     94# if CPPAD_HAS_NULLPTR
    9595# define CPPAD_NULL     nullptr 
    9696# else
Note: See TracChangeset for help on using the changeset viewer.