|
From: Ferdinando A. <na...@us...> - 2006-05-25 17:02:13
|
Update of /cvsroot/objecthandler/ObjectHandler/Examples/xl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12155/Examples/xl Modified Files: ExampleXllStatic_vc8.vcproj addindynamic1.cpp addindynamic2.cpp addinstatic.cpp Log Message: auto_linking Index: addindynamic1.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/addindynamic1.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** addindynamic1.cpp 19 May 2006 15:12:41 -0000 1.1 --- addindynamic1.cpp 25 May 2006 17:01:56 -0000 1.2 *************** *** 21,24 **** --- 21,33 ---- #include <ohxl/conversions.hpp> #include <ohxl/functioncall.hpp> + /* Use BOOST_MSVC instead of _MSC_VER since some other vendors (Metrowerks, + for example) also #define _MSC_VER + */ + #ifdef BOOST_MSVC + # define BOOST_LIB_DIAGNOSTIC + # include <oh/auto_link.hpp> + # include <xlsdk/auto_link.hpp> + # undef BOOST_LIB_DIAGNOSTIC + #endif #include <sstream> *************** *** 59,63 **** DLLEXPORT char* addin1CreateAccount( ! char *instanceName, long *accountNumber, char *accountType) { --- 68,72 ---- DLLEXPORT char* addin1CreateAccount( ! char *instanceName, long *accountNumber, char *accountType) { *************** *** 67,71 **** ObjHandler::obj_ptr objectPointer(new AccountObject( ! *accountNumber, accountType)); objectPointer->setProperties( --- 76,80 ---- ObjHandler::obj_ptr objectPointer(new AccountObject( ! *accountNumber, accountType)); objectPointer->setProperties( Index: ExampleXllStatic_vc8.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/ExampleXllStatic_vc8.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ExampleXllStatic_vc8.vcproj 25 May 2006 10:45:35 -0000 1.4 --- ExampleXllStatic_vc8.vcproj 25 May 2006 17:01:56 -0000 1.5 *************** *** 49,53 **** Optimization="0" AdditionalIncludeDirectories=".,..\..,$(LOG4CXX_DIR)\include" ! PreprocessorDefinitions="XLLSTATIC" MinimalRebuild="true" BasicRuntimeChecks="3" --- 49,53 ---- Optimization="0" AdditionalIncludeDirectories=".,..\..,$(LOG4CXX_DIR)\include" ! PreprocessorDefinitions="XLL_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" *************** *** 148,152 **** InlineFunctionExpansion="1" AdditionalIncludeDirectories=".,..\..,$(LOG4CXX_DIR)\include" ! PreprocessorDefinitions="XLLSTATIC" StringPooling="true" RuntimeLibrary="0" --- 148,152 ---- InlineFunctionExpansion="1" AdditionalIncludeDirectories=".,..\..,$(LOG4CXX_DIR)\include" ! PreprocessorDefinitions="XLL_STATIC" StringPooling="true" RuntimeLibrary="0" *************** *** 245,249 **** InlineFunctionExpansion="1" AdditionalIncludeDirectories=".,..\..,$(LOG4CXX_DIR)\include" ! PreprocessorDefinitions="XLLSTATIC" StringPooling="true" RuntimeLibrary="2" --- 245,249 ---- InlineFunctionExpansion="1" AdditionalIncludeDirectories=".,..\..,$(LOG4CXX_DIR)\include" ! PreprocessorDefinitions="XLL_STATIC" StringPooling="true" RuntimeLibrary="2" *************** *** 341,345 **** Optimization="0" AdditionalIncludeDirectories=".,..\..,$(LOG4CXX_DIR)\include" ! PreprocessorDefinitions="XLLSTATIC" MinimalRebuild="true" BasicRuntimeChecks="3" --- 341,345 ---- Optimization="0" AdditionalIncludeDirectories=".,..\..,$(LOG4CXX_DIR)\include" ! PreprocessorDefinitions="XLL_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" Index: addinstatic.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/addinstatic.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** addinstatic.cpp 25 May 2006 10:45:35 -0000 1.2 --- addinstatic.cpp 25 May 2006 17:01:56 -0000 1.3 *************** *** 17,21 **** #include <account.hpp> ! #include <oh/objhandler.hpp> #include <ohxl/conversions.hpp> #include <ohxl/register.hpp> --- 17,21 ---- #include <account.hpp> ! #include <xlsdk/xlsdk.hpp> #include <ohxl/conversions.hpp> #include <ohxl/register.hpp> *************** *** 23,27 **** #include <ohxl/instancenamexl.hpp> #include <ohxl/functioncall.hpp> ! #include <xlsdk/xlsdk.hpp> /* Use BOOST_MSVC instead of _MSC_VER since some other vendors (Metrowerks, for example) also #define _MSC_VER --- 23,27 ---- #include <ohxl/instancenamexl.hpp> #include <ohxl/functioncall.hpp> ! #include <oh/objhandler.hpp> /* Use BOOST_MSVC instead of _MSC_VER since some other vendors (Metrowerks, for example) also #define _MSC_VER *************** *** 29,33 **** #ifdef BOOST_MSVC # define BOOST_LIB_DIAGNOSTIC ! # include <log4cxx/autolink.hpp> # undef BOOST_LIB_DIAGNOSTIC #endif --- 29,33 ---- #ifdef BOOST_MSVC # define BOOST_LIB_DIAGNOSTIC ! # include <oh/auto_link.hpp> # undef BOOST_LIB_DIAGNOSTIC #endif *************** *** 80,84 **** DLLEXPORT char *createAccount( ! char *instanceName, long *accountNumber, char *accountType) { --- 80,84 ---- DLLEXPORT char *createAccount( ! char *instanceName, long *accountNumber, char *accountType) { *************** *** 88,92 **** ObjHandler::obj_ptr objectPointer(new AccountObject( ! *accountNumber, accountType)); objectPointer->setProperties( --- 88,92 ---- ObjHandler::obj_ptr objectPointer(new AccountObject( ! *accountNumber, accountType)); objectPointer->setProperties( Index: addindynamic2.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/addindynamic2.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** addindynamic2.cpp 19 May 2006 15:12:41 -0000 1.1 --- addindynamic2.cpp 25 May 2006 17:01:56 -0000 1.2 *************** *** 20,23 **** --- 20,32 ---- #include <xlsdk/xlsdk.hpp> #include <ohxl/conversions.hpp> + /* Use BOOST_MSVC instead of _MSC_VER since some other vendors (Metrowerks, + for example) also #define _MSC_VER + */ + #ifdef BOOST_MSVC + # define BOOST_LIB_DIAGNOSTIC + # include <oh/auto_link.hpp> + # include <xlsdk/auto_link.hpp> + # undef BOOST_LIB_DIAGNOSTIC + #endif #include <sstream> |
