[QuantLibAddin-cvs] QuantLibAddin/qlo Makefile.am, 1.5, 1.6 qladdindefines.hpp, 1.9, 1.10

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

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

Modified Files:
	Makefile.am qladdindefines.hpp 
Log Message:
merge branch and increment version number

Index: Makefile.am
===================================================================
RCS file: /cvsroot/quantlibaddin/QuantLibAddin/qlo/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.am	3 Oct 2006 14:58:13 -0000	1.5
--- Makefile.am	14 Dec 2006 12:29:49 -0000	1.6
***************
*** 34,37 ****
--- 34,38 ----
      interpolation2D.hpp \
      interpolation.hpp \
+     marketmodels.hpp \
      mathf.hpp \
      optimization.hpp \

Index: qladdindefines.hpp
===================================================================
RCS file: /cvsroot/quantlibaddin/QuantLibAddin/qlo/qladdindefines.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** qladdindefines.hpp	11 Oct 2006 13:48:57 -0000	1.9
--- qladdindefines.hpp	14 Dec 2006 12:29:49 -0000	1.10
***************
*** 27,36 ****
  
  #include <oh/objhandler.hpp>
! #if OBJHANDLER_HEX_VERSION < 0x000105f0
      #error using an incorrect version of ObjectHandler, please update.
  #endif
  
  #include <ql/qldefines.hpp>
! #if QL_HEX_VERSION < 0x000314f0
      #error using an incorrect version of QuantLib, please update.
  #endif
--- 27,36 ----
  
  #include <oh/objhandler.hpp>
! #if OBJHANDLER_HEX_VERSION < 0x000200f0
      #error using an incorrect version of ObjectHandler, please update.
  #endif
  
  #include <ql/qldefines.hpp>
! #if QL_HEX_VERSION < 0x000400f0
      #error using an incorrect version of QuantLib, please update.
  #endif
***************
*** 38,44 ****
  //! version string
  #ifdef _DEBUG
!     #define QLADDIN_VERSION "0.3.14-debug"
  #else
!     #define QLADDIN_VERSION "0.3.14"
  #endif
  
--- 38,44 ----
  //! version string
  #ifdef _DEBUG
!     #define QLADDIN_VERSION "0.4.0-debug"
  #else
!     #define QLADDIN_VERSION "0.4.0"
  #endif
  
***************
*** 46,50 ****
  #define QLADDIN_HEX_VERSION 0x000314a0
  //! version string for output lib name
! #define QLADDIN_LIB_VERSION "0_3_14"
  
  #if defined BOOST_MSVC
--- 46,50 ----
  #define QLADDIN_HEX_VERSION 0x000314a0
  //! version string for output lib name
! #define QLADDIN_LIB_VERSION "0_4_0"
  
  #if defined BOOST_MSVC