Changeset 3624


Ignore:
Timestamp:
Jan 29, 2015 6:45:00 AM (5 years ago)
Author:
bradbell
Message:

merge to branch: stable/20150000
from repository: https://github.com/coin-or/CppAD
start hash code: c3406d4725b65b1d406b1f2f89a2262409d68acf
end hash code: 27dd8143797c7ebe05baec4eae0ca93d19b89d3b

commit 27dd8143797c7ebe05baec4eae0ca93d19b89d3b
Author: Brad Bell <bradbell@…>
Date: Thu Jan 29 04:37:24 2015 -0700

Fix some g++ 4.9.2 compiler warnings.

Location:
stable/20150000
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/20150000/cppad/local/load_op.hpp

    r3322 r3624  
    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
     
    234234        CPPAD_ASSERT_UNKNOWN( NumRes(LdpOp) == 1 );
    235235        CPPAD_ASSERT_UNKNOWN( 0 < arg[0] );
    236         CPPAD_ASSERT_UNKNOWN( arg[2] < play->num_load_op_rec() );
    237 
    238         // Because the index is a parameter, this indexing error should be
    239         // caught and reported to the user at an when the tape is recording.
     236        CPPAD_ASSERT_UNKNOWN( size_t(arg[2]) < play->num_load_op_rec() );
     237
     238        // Because the index is a parameter, this indexing error should have been
     239        // caught and reported to the user when the tape is recording.
    240240        size_t i_vec = arg[1];
    241241        CPPAD_ASSERT_UNKNOWN( i_vec < index_by_ind[ arg[0] - 1 ] );
     
    277277        CPPAD_ASSERT_UNKNOWN( NumRes(LdvOp) == 1 );
    278278        CPPAD_ASSERT_UNKNOWN( 0 < arg[0] );
    279         CPPAD_ASSERT_UNKNOWN( arg[2] < play->num_load_op_rec() );
     279        CPPAD_ASSERT_UNKNOWN( size_t(arg[2]) < play->num_load_op_rec() );
    280280
    281281        size_t i_vec = Integer( taylor[ arg[1] * cap_order + 0 ] );
     
    395395        CPPAD_ASSERT_UNKNOWN( 0 < p);
    396396        CPPAD_ASSERT_UNKNOWN( p <= q );
    397         CPPAD_ASSERT_UNKNOWN( arg[2] < play->num_load_op_rec() );
     397        CPPAD_ASSERT_UNKNOWN( size_t(arg[2]) < play->num_load_op_rec() );
    398398
    399399        size_t i_var = size_t( var_by_load_op[ arg[2] ] );
  • stable/20150000/cppad/local/optimize.hpp

    r3507 r3624  
    22492249                                tape[i_var].new_var = rec->PutOp(op);
    22502250                                CPPAD_ASSERT_UNKNOWN(
    2251                                         size_t(new_arg[1]) < tape[i_var].new_var
     2251                                        new_arg[1] < tape[i_var].new_var
    22522252                                );
    22532253                                replace_hash = true;
  • stable/20150000/cppad_ipopt/example/ode_check.cpp

    r2683 r3624  
    11/* $Id$ */
    22/* --------------------------------------------------------------------------
    3 CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-12 Bradley M. Bell
     3CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    44
    55CppAD is distributed under multiple licenses. This distribution is under
     
    101101        ok &= CppAD::NearEqual(check, obj_value, rel_tol, abs_tol);
    102102
     103        // Use this empty namespace function to avoid warning that it is not used
     104        static size_t ode_check_count = 0;
     105        ode_check_count++;
     106        ok &= count_eval_r() == ode_check_count;
     107
    103108        return ok;
    104109}
Note: See TracChangeset for help on using the changeset viewer.