Changeset 1554 for trunk


Ignore:
Timestamp:
May 27, 2010 8:00:32 PM (11 years ago)
Author:
lou
Message:

Convert CLPVERSION to CLP_VERSION for consistency with upcoming changes.

Location:
trunk/Clp
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Clp/configure

    r1421 r1554  
    2067020670
    2067120671cat >>confdefs.h <<_ACEOF
    20672 #define CLPVERSION "$PACKAGE_VERSION"
     20672#define CLP_VERSION "$PACKAGE_VERSION"
    2067320673_ACEOF
    2067420674

  • trunk/Clp/configure.ac

    r1421 r1554  
    9999#############################################################################
    100100
    101 AC_DEFINE_UNQUOTED(CLPVERSION, "$PACKAGE_VERSION", "Version of Clp")
     101AC_DEFINE_UNQUOTED(CLP_VERSION, "$PACKAGE_VERSION", "Version of Clp")
    102102
    103103#############################################################################

  • trunk/Clp/inc/config_clp.h.in

    r1421 r1554  
    22
    33/* "Version of Clp" */
    4 #undef CLPVERSION
     4#undef CLP_VERSION
    55
    66/* Define to the debug sanity check level (0 is no test) */

  • trunk/Clp/src/ClpConfig.h

    r1421 r1554  
    2020
    2121#ifndef __CLPCONFIG_H__
     22#define __CLPCONFIG_H__
    2223
    2324#ifdef HAVE_CONFIG_H
    … …  
    5859/* #undef COIN_HAS_READLINE */
    5960
    60 #define CLPVERSION "trunk"
     61#define CLP_VERSION "trunk"
    6162
    6263#endif /* HAVE_CONFIG_H */
    6364
    64 #endif /*__HAVE_COINUTILS_CONFIG_H__*/
     65#endif /*__CLPCONFIG_H__ */

  • trunk/Clp/src/ClpMain.cpp

    r1525 r1554  
    207207          //models[0].setPrimalColumnPivotAlgorithm(steepP);
    208208          std::string field;
    209           std::cout << "Coin LP version " << CLPVERSION
     209          std::cout << "Coin LP version " << CLP_VERSION
    210210                    << ", build " << __DATE__ << std::endl;
    211211          // Print command line
    … …  
    16591659                              break;
    16601660                         case CLP_PARAM_ACTION_HELP:
    1661                               std::cout << "Coin LP version " << CLPVERSION
     1661                              std::cout << "Coin LP version " << CLP_VERSION
    16621662                                        << ", build " << __DATE__ << std::endl;
    16631663                              std::cout << "Non default values:-" << std::endl;
Note: See TracChangeset for help on using the changeset viewer.