Changeset 3275


Ignore:
Timestamp:
May 20, 2014 1:35:11 PM (6 years ago)
Author:
bradbell
Message:

Better checking for if an file already included.

Location:
trunk
Files:
6 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/bin/check_include_def.sh

    r2859 r3275  
    22# $Id$
    33# -----------------------------------------------------------------------------
    4 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-13 Bradley M. Bell
     4# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
    55#
    66# CppAD is distributed under multiple licenses. This distribution is under
     
    2020echo "Also make sure same ifndef not used by two different files."
    2121echo "-------------------------------------------------------------------"
    22 grep '^# *ifndef *CPPAD_[0-9a-zA-Z_]*_INCLUDED$' \
    23         cppad_ipopt/*/*.hpp \
    24         cppad/*.hpp \
    25         cppad/example/*.hpp \
    26         cppad/local/*.hpp \
    27         cppad/speed/*.hpp \
    28         example/*.hpp \
    29         example/atomic/*.hpp \
    30         multi_thread/*.hpp \
    31         | sed \
    32         -e 's|.*# *ifndef *CPPAD_\([0-9a-zA-Z_]*\)_INCLUDED$|\1.HPP|' \
     22list=`find . -name '*.hpp' | sed \
     23        -e '\/new\//d' -e '/\/build\//d' -e '/\/junk.hpp$/d' -e '/\/temp.hpp/d'`
     24#
     25grep '^# *ifndef *CPPAD_[0-9a-zA-Z_]*_INCLUDED$' $list \
     26        | sed -e 's|.*# *ifndef *CPPAD_\([0-9a-zA-Z_]*\)_INCLUDED$|\1.HPP|' \
    3327        | tr [a-zA-Z] [A-Za-z] \
    3428        | sort \
    3529        > bin/check_include_def.1.$$
    36  
    37 ls \
    38         cppad_ipopt/*/*.hpp \
    39         cppad/*.hpp \
    40         cppad/example/*.hpp \
    41         cppad/local/*.hpp \
    42         cppad/speed/*.hpp \
    43         example/*.hpp \
    44         example/atomic/*.hpp \
    45         multi_thread/*.hpp \
    46         | sed -e 's|.*/||' \
    47         | sort -u \
    48         > bin/check_include_def.2.$$
     30#
     31echo "$list" | sed -e 's|\([^ ]*\)/||g' | sort -u > bin/check_include_def.2.$$
     32#
    4933if diff bin/check_include_def.1.$$ bin/check_include_def.2.$$
    5034then
  • trunk/cppad/ipopt/solve_callback.hpp

    r3232 r3275  
    11/* $Id$ */
    2 # ifndef CPPAD_SOLVE_FULL_INCLUDED
    3 # define CPPAD_SOLVE_FULL_INCLUDED
     2# ifndef CPPAD_SOLVE_CALLBACK_INCLUDED
     3# define CPPAD_SOLVE_CALLBACK_INCLUDED
    44/* --------------------------------------------------------------------------
    55CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
  • trunk/omh/whats_new/whats_new_14.omh

    r3270 r3275  
    1414$dollar @$$
    1515$spell
     16        alloc
     17        ifndef
    1618        asin
    1719        acos
     
    5355assist you in learning about changes between various versions of CppAD.
    5456
     57$head 05-20$$
     58$list number$$
     59Move $code speed/adolc/alloc_mat.hpp$$ to
     60$code speed/adolc/adolc_alloc_mat.hpp$$ so it has the
     61same name is its $code # ifndef$$ command.
     62$lnext
     63Fix $code # ifndef$$ command in
     64$code cppad/ipopt/solve_callback.hpp$$.
     65$lnext
     66Add $code # ifndef$$ command to $code test_more/extern_value.hpp$$.
     67$lend
     68
     69
    5570$head 05-19$$
    5671In the files
  • trunk/speed/adolc/adolc_alloc_mat.hpp

    r3229 r3275  
    11/* $Id$ */
    22/* --------------------------------------------------------------------------
    3 CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-12 Bradley M. Bell
     3CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
    44
    55CppAD is distributed under multiple licenses. This distribution is under
  • trunk/speed/adolc/makefile.am

    r3121 r3275  
    3636#
    3737adolc_SOURCES = \
    38         alloc_mat.hpp \
     38        adolc_alloc_mat.hpp \
    3939        alloc_mat.cpp \
    4040        ../main.cpp \
  • trunk/speed/adolc/poly.cpp

    r3094 r3275  
    5757# include <cppad/vector.hpp>
    5858# include <cppad/thread_alloc.hpp>
    59 # include "alloc_mat.hpp"
     59# include "adolc_alloc_mat.hpp"
    6060
    6161// list of possible options
  • trunk/test_more/extern_value.hpp

    r2756 r3275  
    11/* $Id$ */
    22/* --------------------------------------------------------------------------
    3 CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-13 Bradley M. Bell
     3CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
    44
    55CppAD is distributed under multiple licenses. This distribution is under
     
    1010Please visit http://www.coin-or.org/CppAD/ for information on other licenses.
    1111-------------------------------------------------------------------------- */
     12
     13# ifndef CPPAD_EXTERN_VALUE_INCLUDED
     14# define CPPAD_EXTERN_VALUE_INCLUDED
    1215
    1316template <class Type>
     
    2023        Type get(void);
    2124};
     25
     26# endif
Note: See TracChangeset for help on using the changeset viewer.