Update of /cvsroot/quantlibaddin/QuantLibAddin/Clients/C++
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17144/Clients/C++
Modified Files:
ClientCppDemo_vc8.vcproj Makefile.am qlademo.cpp
Log Message:
merge R000313f0-branch
Index: ClientCppDemo_vc8.vcproj
===================================================================
RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Clients/C++/ClientCppDemo_vc8.vcproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ClientCppDemo_vc8.vcproj 11 Jun 2006 18:16:50 -0000 1.3
--- ClientCppDemo_vc8.vcproj 28 Aug 2006 10:05:22 -0000 1.4
***************
*** 44,48 ****
Name="VCCLCompilerTool"
Optimization="0"
! AdditionalIncludeDirectories="$(QUANTLIBADDIN_DIR),$(OBJECT_HANDLER_DIR),$(QL_DIR),$(QL_DIR)/functions"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
--- 44,48 ----
Name="VCCLCompilerTool"
Optimization="0"
! AdditionalIncludeDirectories="..\..,$(OBJECT_HANDLER_DIR),$(QL_DIR),$(QL_DIR)/functions"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
***************
*** 139,143 ****
Optimization="2"
InlineFunctionExpansion="1"
! AdditionalIncludeDirectories="$(QUANTLIBADDIN_DIR),$(OBJECT_HANDLER_DIR),$(QL_DIR),$(QL_DIR)/functions"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
--- 139,143 ----
Optimization="2"
InlineFunctionExpansion="1"
! AdditionalIncludeDirectories="..\..,$(OBJECT_HANDLER_DIR),$(QL_DIR),$(QL_DIR)/functions"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
***************
*** 232,236 ****
Optimization="2"
InlineFunctionExpansion="1"
! AdditionalIncludeDirectories="$(QUANTLIBADDIN_DIR),$(OBJECT_HANDLER_DIR),$(QL_DIR),$(QL_DIR)/functions"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
--- 232,236 ----
Optimization="2"
InlineFunctionExpansion="1"
! AdditionalIncludeDirectories="..\..,$(OBJECT_HANDLER_DIR),$(QL_DIR),$(QL_DIR)/functions"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
***************
*** 324,328 ****
Name="VCCLCompilerTool"
Optimization="0"
! AdditionalIncludeDirectories="$(QUANTLIBADDIN_DIR),$(OBJECT_HANDLER_DIR),$(QL_DIR),$(QL_DIR)/functions"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
--- 324,328 ----
Name="VCCLCompilerTool"
Optimization="0"
! AdditionalIncludeDirectories="..\..,$(OBJECT_HANDLER_DIR),$(QL_DIR),$(QL_DIR)/functions"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
Index: Makefile.am
===================================================================
RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Clients/C++/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am 27 Jul 2006 14:06:30 -0000 1.2
--- Makefile.am 28 Aug 2006 10:05:22 -0000 1.3
***************
*** 7,11 ****
EXTRA_DIST = \
- ClientCppDemo.dsp \
ClientCppDemo.vcproj \
ClientCppDemo_vc8.vcproj
--- 7,10 ----
Index: qlademo.cpp
===================================================================
RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Clients/C++/qlademo.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** qlademo.cpp 27 Jul 2006 14:06:30 -0000 1.3
--- qlademo.cpp 28 Aug 2006 10:05:22 -0000 1.4
***************
*** 1,5 ****
/*
! Copyright (C) 2004, 2005 Eric Ehlers
This file is part of QuantLib, a free-software/open-source library
--- 1,5 ----
/*
! Copyright (C) 2004, 2005, 2006 Eric Ehlers
This file is part of QuantLib, a free-software/open-source library
***************
*** 16,19 ****
--- 16,20 ----
*/
+ #include <oh/objhandler.hpp>
#include <ql/quantlib.hpp>
#include <qlo/qladdin.hpp>
***************
*** 21,24 ****
--- 22,33 ----
#include <iostream>
+ #ifdef BOOST_MSVC
+ # define BOOST_LIB_DIAGNOSTIC
+ # include <oh/auto_link.hpp>
+ # include <qlo/qladdindefines.hpp>
+ # include <qlo/auto_link.hpp>
+ # undef BOOST_LIB_DIAGNOSTIC
+ #endif
+
using namespace std;
using namespace QuantLib;
|