Changeset 3630


Ignore:
Timestamp:
Feb 1, 2015 8:51:41 AM (5 years ago)
Author:
bradbell
Message:

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

commit 4a94278cacc91a9e8e1934659b38caafb940dec8
Author: Brad Bell <bradbell@…>
Date: Sun Feb 1 06:47:09 2015 -0700

CMakeLists.txt: Only install cppad_colpack.cpp when colpack_prefix is specified.

commit 1c46b663c550ae3b76ff195d9fee09c7c1da6dff
Author: Brad Bell <bradbell@…>
Date: Sun Feb 1 06:29:01 2015 -0700

tag_month.sh: create tag for this month (must be run on first day).

commit 31ff0b4db0f1be8fc431459ef554919c8b889eff
Author: Brad Bell <bradbell@…>
Date: Sat Jan 31 08:44:08 2015 -0700

configure.hpp.in: group all C++11 featues togeather.

Location:
trunk
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r3615 r3630  
    357357        FILES_MATCHING PATTERN "*.hpp"
    358358)
    359 INSTALL(
    360         FILES "cppad/local/cppad_colpack.cpp"
    361         DESTINATION ${cppad_abs_datadir}/cppad
    362 )
     359IF( colpack_prefix )
     360        INSTALL(
     361                FILES "cppad/local/cppad_colpack.cpp"
     362                DESTINATION ${cppad_abs_datadir}/cppad
     363        )
     364ENDIF( colpack_prefix )
    363365#
    364366# During install copy doc direcrory to cppad_abs_docdir/cppad
  • trunk/cppad/configure.hpp.in

    r3495 r3630  
    1 // $Id:$
     1// $Id$
    22# ifndef CPPAD_CONFIGURE_INCLUDED
    33# define CPPAD_CONFIGURE_INCLUDED
    44
    55/* --------------------------------------------------------------------------
    6 CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
     6CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    77
    88CppAD is distributed under multiple licenses. This distribution is under
    9 the terms of the 
     9the terms of the
    1010                    Eclipse Public License Version 1.0.
    1111
     
    3636/*!
    3737 \file configure.hpp
    38 Replacement for config.h so that all preprocessor symbols begin with CPPAD_ 
     38Replacement for config.h so that all preprocessor symbols begin with CPPAD_
    3939*/
    4040
    4141/*!
    4242\def CPPAD_HAS_RVALUE
    43 Does this compiler cupport c++11 rvalues; i.e., values with move semantics
     43C++11: Does compiler cupport rvalues; i.e., values with move semantics
    4444*/
    4545# define CPPAD_HAS_RVALUE @cppad_has_rvalue@
     46
     47/*!
     48def CPPAD_HAS_NULLPTR
     49C++11: Does compiler support the null-pointer constant nullptr
     50*/
     51# define CPPAD_HAS_NULLPTR @cppad_has_nullptr@
     52
     53/*!
     54\def CPPAD_HAS_CSTDINT_8_TO_64
     55C++11: Does compiler support the types uint_8, uint_16, uint_32, and uint_64
     56*/
     57# define CPPAD_HAS_CSTDINT_8_TO_64 @cppad_has_cstdint_8_to_64@
     58
     59/*!
     60\def CPPAD_COMPILER_HAS_ERF
     61C++11: Does compiler support std::erf(double)
     62*/
     63# define CPPAD_COMPILER_HAS_ERF @cppad_compiler_has_erf@
    4664
    4765/*!
     
    5876
    5977/*!
    60 def CPPAD_HAS_NULLPTR
    61 Does this compiler support the a c++11 null-pointer constant nullptr
    62 (true = 1, false = 0).
    63 */
    64 # define CPPAD_HAS_NULLPTR @cppad_has_nullptr@
    65  
    66  /*!
    6778def CPPAD_INTERNAL_SPARSE_SET
    6879is the internal representation used for sparse vectors of std::set<size_t>
     
    7384/*!
    7485\def CPPAD_IMPLICIT_CTOR_FROM_ANY_TYPE
    75 If this symbol is one, an implicit constor of AD<Base> is defined 
     86If this symbol is one, an implicit constor of AD<Base> is defined
    7687where the argument has any type.
    7788Otherwise this constructor is explicit.
     
    8394If this symbol is one, and _MSC_VER is not defined,
    8495we are using boost vector for CPPAD_TESTVECTOR.
    85 It this symbol is zero, 
     96It this symbol is zero,
    8697we are not using boost vector for CPPAD_TESTVECTOR.
    8798*/
     
    90101/*!
    91102\def CPPAD_CPPADVECTOR
    92 If this symbol is one, 
     103If this symbol is one,
    93104we are using CppAD vector for CPPAD_TESTVECTOR.
    94 It this symbol is zero, 
     105It this symbol is zero,
    95106we are not using CppAD vector for CPPAD_TESTVECTOR.
    96107*/
     
    99110/*!
    100111\def CPPAD_STDVECTOR
    101 If this symbol is one, 
     112If this symbol is one,
    102113we are using standard vector for CPPAD_TESTVECTOR.
    103 It this symbol is zero, 
     114It this symbol is zero,
    104115we are not using standard vector for CPPAD_TESTVECTOR.
    105116*/
     
    108119/*!
    109120\def CPPAD_EIGENVECTOR
    110 If this symbol is one, 
     121If this symbol is one,
    111122we are using Eigen vector for CPPAD_TESTVECTOR.
    112 If this symbol is zero, 
     123If this symbol is zero,
    113124we are not using Eigen vector for CPPAD_TESTVECTOR.
    114125*/
     
    124135
    125136/*!
    126 \def CPPAD_SIZE_T_NOT_UNSIGNED_INT 
     137\def CPPAD_SIZE_T_NOT_UNSIGNED_INT
    127138If this symbol is zero, the type size_t is the same as the type unsigned int,
    128139otherwise this symbol is one.
     
    131142
    132143/*!
    133 \def CPPAD_HAS_CSTDINT_8_TO_64
    134 If this symbol is one, the types uint_8, uint_16, uint_32, and uint_64
    135 are defined.  otherwise this symbol is zero.
    136 */
    137 # define CPPAD_HAS_CSTDINT_8_TO_64 @cppad_has_cstdint_8_to_64@
    138 
    139 /*!
    140 \def CPPAD_COMPILER_HAS_ERF
    141 If this symbol is one, the function std::erf(double) is defined by the
    142 C++ compiler, otherwise the symbol is zero.
    143 */
    144 # define CPPAD_COMPILER_HAS_ERF @cppad_compiler_has_erf@
    145 
    146 /*!
    147144\def CPPAD_TAPE_ADDR_TYPE
    148 Is the type used to store address on the tape. If not size_t, then 
     145Is the type used to store address on the tape. If not size_t, then
    149146<code>sizeof(CPPAD_TAPE_ADDR_TYPE) <= sizeof( size_t )</code>
    150147to conserve memory.
     
    160157/*!
    161158\def CPPAD_TAPE_ID_TYPE
    162 Is the type used to store tape identifiers. If not size_t, then 
     159Is the type used to store tape identifiers. If not size_t, then
    163160<code>sizeof(CPPAD_TAPE_ID_TYPE) <= sizeof( size_t )</code>
    164161to conserve memory.
     
    171168*/
    172169# define CPPAD_TAPE_ID_TYPE @cppad_tape_id_type@
    173  
     170
    174171/*!
    175172\def CPPAD_MAX_NUM_THREADS
Note: See TracChangeset for help on using the changeset viewer.