Changeset 3063


Ignore:
Timestamp:
Dec 28, 2013 9:18:23 AM (6 years ago)
Author:
bradbell
Message:

Do not abbreviate cppad_implicit_ctor_from_any_type.

cmake.omh: mention that ctor from any type is depricated.

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/bin/run_cmake.sh

    r3061 r3063  
    8181#
    8282# simple options
    83 cmake_args="$cmake_args -D cppad_implicit_ctor_from_any_type=NO"
     83cmake_args="$cmake_args -D cppad_implicit_ctor_from_any_type_from_any_type=NO"
    8484cmake_args="$cmake_args -D cppad_documentation=YES"
    8585cmake_args="$cmake_args -D cppad_sparse_list=YES"
  • trunk/cppad/CMakeLists.txt

    r3061 r3063  
    4949)
    5050#
    51 # cppad_implicit_ctor_from_any_type
    52 command_line_arg(cppad_implicit_ctor_from_any_type NO BOOL
     51# cppad_implicit_ctor_from_any_type_from_any_type
     52command_line_arg(cppad_implicit_ctor_from_any_type_from_any_type NO BOOL
    5353        "implicit (instead of explicit) conversion from any type to AD<Base>"
    5454)
    5555# -----------------------------------------------------------------------------
    5656# cppad_explicit_ctor
    57 IF( cppad_implicit_ctor_from_any_type )
    58         SET(cppad_implicit_ctor 1)
    59 ELSE( cppad_implicit_ctor_from_any_type )
    60         SET(cppad_implicit_ctor 0)
    61 ENDIF( cppad_implicit_ctor_from_any_type )
     57IF( cppad_implicit_ctor_from_any_type_from_any_type )
     58        SET(cppad_implicit_ctor_from_any_type 1)
     59ELSE( cppad_implicit_ctor_from_any_type_from_any_type )
     60        SET(cppad_implicit_ctor_from_any_type 0)
     61ENDIF( cppad_implicit_ctor_from_any_type_from_any_type )
    6262# -----------------------------------------------------------------------------
    6363# cppad_internal_sparse_set
  • trunk/cppad/configure.hpp.in

    r3061 r3063  
    6262
    6363/*!
    64 \def CPPAD_IMPLICIT_CTOR
     64\def CPPAD_IMPLICIT_CTOR_FROM_ANY_TYPE
    6565If this symbol is one, an implicit constor of AD<Base> is defined
    6666where the argument has any type.
    6767Otherwise this constructor is explicit.
    6868*/
    69 # define CPPAD_IMPLICIT_CTOR @cppad_implicit_ctor@
     69# define CPPAD_IMPLICIT_CTOR_FROM_ANY_TYPE @cppad_implicit_ctor_from_any_type@
    7070
    7171/*!
  • trunk/cppad/local/ad.hpp

    r3061 r3063  
    162162        inline AD& operator=(const VecAD_reference<Base> &x);
    163163
    164 # if CPPAD_IMPLICIT_CTOR
     164# if CPPAD_IMPLICIT_CTOR_FROM_ANY_TYPE
    165165        // implicit construction from some other type (depricated)
    166166        template <class T> inline AD(const T &t);
  • trunk/cppad/local/ad_ctor.hpp

    r3061 r3063  
    6666$index deprecated, constructor$$
    6767$index constructor, deprecated$$
    68 If you set $cref/cppad_implicit_ctor/cmake/cppad_implicit_ctor/$$
     68If you set
     69$cref/cppad_implicit_ctor_from_any_type
     70        /cmake
     71        /cppad_implicit_ctor_from_any_type
     72/$$
    6973to be $code YES$$ during the install procedure,
    7074you will get an implicit constructor with prototype
  • trunk/cppad/local/undef.hpp

    r3061 r3063  
    6767# undef CPPAD_HAS_GETTIMEOFDAY
    6868# undef CPPAD_HAS_NULLPTR
    69 # undef CPPAD_IMPLICIT_CTOR
     69# undef CPPAD_IMPLICIT_CTOR_FROM_ANY_TYPE
    7070# undef CPPAD_INLINE_FRIEND_TEMPLATE_FUNCTION
    7171# undef CPPAD_MAX_NUM_CAPACITY
  • trunk/omh/install/cmake.omh

    r3061 r3063  
    8484and execute the following command:
    8585$codei%
    86 cmake %%                                                          \
    87         -G %generator%                                               \
    88         -D cmake_install_prefix=%cmake_install_prefix%               \
    89         -D cmake_install_includedirs=%cmake_install_includedirs%     \
    90         -D cmake_install_datadir=%cmake_install_datadir%             \
    91         -D cmake_install_libdirs=%cmake_install_libdirs%             \
    92         -D cmake_install_postfix=%cmake_install_postfix%             \
     86cmake %%                                                                      \
     87        -G %generator%                                                           \
     88        -D cmake_install_prefix=%cmake_install_prefix%                           \
     89        -D cmake_install_includedirs=%cmake_install_includedirs%                 \
     90        -D cmake_install_datadir=%cmake_install_datadir%                         \
     91        -D cmake_install_libdirs=%cmake_install_libdirs%                         \
     92        -D cmake_install_postfix=%cmake_install_postfix%                         \
    9393        \
    94         -D adolc_prefix=%adolc_prefix%                               \
    95         -D eigen_prefix=%eigen_prefix%                               \
    96         -D fadbad_prefix=%fadbad_prefix%                             \
    97         -D ipopt_prefix=%ipopt_prefix%                               \
    98         -D sacado_prefix=%sacado_prefix%                             \
     94        -D adolc_prefix=%adolc_prefix%                                           \
     95        -D eigen_prefix=%eigen_prefix%                                           \
     96        -D fadbad_prefix=%fadbad_prefix%                                         \
     97        -D ipopt_prefix=%ipopt_prefix%                                           \
     98        -D sacado_prefix=%sacado_prefix%                                         \
    9999        \
    100         -D cppad_cxx_flags=%cppad_cxx_flags%                         \
    101         -D cppad_documentation=%cppad_documentation%                 \
     100        -D cppad_cxx_flags=%cppad_cxx_flags%                                     \
     101        -D cppad_documentation=%cppad_documentation%                             \
    102102        \
    103         -D cppad_testvector=%cppad_testvector%                       \
    104         -D cppad_max_num_threads=%cppad_max_num_threads%             \
    105         -D cppad_sparse_list=%cppad_sparse_list%                     \
    106         -D cppad_tape_id_type=%cppad_tape_id_type%                   \
    107         -D cppad_tape_addr_type=%cppad_tape_addr_type%               \
    108         -D cppad_implicit_ctor_from_any_type=%cppad_implicit_ctor \
     103        -D cppad_testvector=%cppad_testvector%                                   \
     104        -D cppad_max_num_threads=%cppad_max_num_threads%                         \
     105        -D cppad_sparse_list=%cppad_sparse_list%                                 \
     106        -D cppad_tape_id_type=%cppad_tape_id_type%                               \
     107        -D cppad_tape_addr_type=%cppad_tape_addr_type%                           \
     108        -D cppad_implicit_ctor_from_any_type=%cppad_implicit_ctor_from_any_type% \
    109109        \
    110110        ..
     
    340340$cref/size_par/seq_property/size_VecAD/$$.
    341341
    342 $head cppad_implicit_ctor$$
     342$head cppad_implicit_ctor_from_any_type$$
    343343$index ctor, implicit or explicit$$
    344344$index implicit, ctor$$
    345345$index explicit, ctor$$
    346 The default value for $icode cppad_implicit_ctor$$ is $code NO$$.
    347 If it is $code YES$$,
    348 there is an implicit type constructor (type conversion)
     346The default value for $icode cppad_implicit_ctor_from_any_type$$ is $code NO$$.
     347If it is $code YES$$, there is a
     348$cref/deprecated/ad_ctor/x/deprecated/$$
     349implicit type constructor (type conversion)
    349350from any type to $codei%AD<%Base%>%$$.
    350 Otherwise this constructor is explicit.
     351Otherwise this constructor is
     352$cref/explicit/ad_ctor/x/explicit/$$.
    351353
    352354
  • trunk/omh/whats_new/whats_new_13.omh

    r3061 r3063  
    8181$icode Base$$ or $codei%AD<%Base%>%$$ before the assignment.
    8282A deprecated alternative is to make this constructor implicit using the
    83 $cref/cppad_implicit_ctor/cmake/cppad_implicit_ctor/$$ option
    84 during the install procedure.
     83$cref/cppad_implicit_ctor_from_any_type
     84        /cmake
     85        /cppad_implicit_ctor_from_any_type
     86/$$
     87option during the install procedure.
    8588
    8689$head 12-26$$
Note: See TracChangeset for help on using the changeset viewer.