[QuantLibAddin-cvs] QuantLibAddin/qlo vcconfig.hpp, NONE, 1.1 auto_link.hpp, 1.1, 1.2 qladdindefines.hpp, 1.3, 1.4 utilities.cpp, 1.2, 1.3

[Eric E. <eri...@us...>]

Update of /cvsroot/quantlibaddin/QuantLibAddin/qlo
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv15617/qlo

Modified Files:
	auto_link.hpp qladdindefines.hpp utilities.cpp 
Added Files:
	vcconfig.hpp 
Log Message:
qlVersion() - include version # of compiler and runtime library

Index: utilities.cpp
===================================================================
RCS file: /cvsroot/quantlibaddin/QuantLibAddin/qlo/utilities.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** utilities.cpp	31 May 2006 18:38:45 -0000	1.2
--- utilities.cpp	12 Jul 2006 16:55:46 -0000	1.3
***************
*** 20,25 ****
      #include <qlo/config.hpp>
  #endif
- #include <ql/qldefines.hpp>
  #include <qlo/utilities.hpp>
  
  #if defined BOOST_MSVC       // Microsoft Visual C++
--- 20,25 ----
      #include <qlo/config.hpp>
  #endif
  #include <qlo/utilities.hpp>
+ #include <qlo/qladdindefines.hpp>
  
  #if defined BOOST_MSVC       // Microsoft Visual C++
***************
*** 28,37 ****
  #  include <ql/auto_link.hpp>
  #  undef BOOST_LIB_DIAGNOSTIC
  #endif
  
  namespace QuantLibAddin {
  
      std::string qlVersion() {
!         return QL_VERSION;
      }
  
--- 28,42 ----
  #  include <ql/auto_link.hpp>
  #  undef BOOST_LIB_DIAGNOSTIC
+ #  include <qlo/vcconfig.hpp>
+ #else
+ #  define COMPILER_STRING
  #endif
  
+ #define VERSION_STRING "QuantLib version " QLADDIN_VERSION COMPILER_STRING
+ 
  namespace QuantLibAddin {
  
      std::string qlVersion() {
!         return VERSION_STRING;
      }
  

--- NEW FILE: vcconfig.hpp ---

/*
 Copyright (C) 2006 Eric Ehlers

 This file is part of QuantLib, a free-software/open-source library
 for financial quantitative analysts and developers - http://quantlib.org/

 QuantLib is free software: you can redistribute it and/or modify it under the
 terms of the QuantLib license.  You should have received a copy of the
 license along with this program; if not, please email qua...@li...
 The license is also available online at http://quantlib.org/html/license.html

 This program is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE.  See the license for more details.
*/

/*
Visual Studio configuration - format symbol COMPILER_STRING
for runtime version info.
*/

#ifndef qla_vcconfig_hpp
#define qla_vcconfig_hpp

#if (_MSC_VER == 1300)
#  define VC_VERSION "7.0"
#elif (_MSC_VER == 1310)
#  define VC_VERSION "7.1"
#elif (_MSC_VER == 1400)
#  define VC_VERSION "8.0"
#else
#  define VC_VERSION "(version unknown)"
#endif

#ifdef _MT
#  define RUNTIME_THREAD "Multithreaded"
#else
#  define RUNTIME_THREAD "Single-threaded"
#endif

#ifdef _DLL
#  define RUNTIME_LINKAGE "Dynamic"
#else
#  define RUNTIME_LINKAGE "Static"
#endif

#if defined(_DEBUG)
#  define RUNTIME_CONFIG "Debug"
#else
#  define RUNTIME_CONFIG "Release"
#endif

#define COMPILER_STRING " - Microsoft Visual Studio version " VC_VERSION " - Runtime library " RUNTIME_THREAD " " RUNTIME_LINKAGE " " RUNTIME_CONFIG

#endif

Index: auto_link.hpp
===================================================================
RCS file: /cvsroot/quantlibaddin/QuantLibAddin/qlo/auto_link.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** auto_link.hpp	25 May 2006 17:25:00 -0000	1.1
--- auto_link.hpp	12 Jul 2006 16:55:46 -0000	1.2
***************
*** 20,27 ****
  
  // select toolset:
! #if (_MSC_VER < 1200)
  #  error "unsupported Microsoft compiler"
- #elif (_MSC_VER == 1200)
- #  define QLADDIN_LIB_TOOLSET "vc6"
  #elif (_MSC_VER == 1300)
  #  define QLADDIN_LIB_TOOLSET "vc7"
--- 20,25 ----
  
  // select toolset:
! #if (_MSC_VER < 1300)
  #  error "unsupported Microsoft compiler"
  #elif (_MSC_VER == 1300)
  #  define QLADDIN_LIB_TOOLSET "vc7"

Index: qladdindefines.hpp
===================================================================
RCS file: /cvsroot/quantlibaddin/QuantLibAddin/qlo/qladdindefines.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** qladdindefines.hpp	31 May 2006 18:36:45 -0000	1.3
--- qladdindefines.hpp	12 Jul 2006 16:55:46 -0000	1.4
***************
*** 41,49 ****
  
  //! version string
! #ifdef _DEBUG
!     #define QLADDIN_VERSION "0.3.13-debug"
! #else
      #define QLADDIN_VERSION "0.3.13"
! #endif
  
  //! version hexadecimal number
--- 41,49 ----
  
  //! version string
! //#ifdef _DEBUG
! //    #define QLADDIN_VERSION "0.3.13-debug"
! //#else
      #define QLADDIN_VERSION "0.3.13"
! //#endif
  
  //! version hexadecimal number