objecthandler-cvs Mailing List for ObjectHandler (Page 20)
Brought to you by:
ericehlers,
nando
Menu
▾
▴
objecthandler-cvs — List for automated CVS check-in messages.
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(115) |
Jun
(109) |
Jul
(85) |
Aug
(49) |
Sep
(19) |
Oct
(105) |
Nov
(16) |
Dec
(43) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(63) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Ferdinando A. <na...@us...> - 2006-06-01 15:58:37
|
Update of /cvsroot/objecthandler/ObjectHandler/Examples/xl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28744/Examples/xl Modified Files: ExampleXllDynamic1.vcproj ExampleXllDynamic2.vcproj ExampleXllStatic.vcproj Log Message: VC7 catching up Index: ExampleXllDynamic2.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/ExampleXllDynamic2.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExampleXllDynamic2.vcproj 19 May 2006 15:12:41 -0000 1.1 --- ExampleXllDynamic2.vcproj 1 Jun 2006 15:58:30 -0000 1.2 *************** *** 43,47 **** LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\..\xlsdk\lib,..\..\ohxl\ohxll\xll" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\build\vc71\DebugCRTDLL/ExampleXLLDynamic2-vc71-mt-gd-0_1_4.pdb" --- 43,47 ---- LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\..\lib,..\..\xll" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\build\vc71\DebugCRTDLL/ExampleXLLDynamic2-vc71-mt-gd-0_1_4.pdb" *************** *** 110,114 **** LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\..\xlsdk\lib,..\..\ohxl\ohxll\xll" ProgramDatabaseFile=".\build\vc71\ReleaseCRTDLL/ExampleXLLDynamic2-vc71-mt-0_1_4.pdb" ImportLibrary=".\build\vc71\ReleaseCRTDLL/ExampleXLLDynamic2-vc71-mt-0_1_4.lib" --- 110,114 ---- LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\..\lib,..\..\xll" ProgramDatabaseFile=".\build\vc71\ReleaseCRTDLL/ExampleXLLDynamic2-vc71-mt-0_1_4.pdb" ImportLibrary=".\build\vc71\ReleaseCRTDLL/ExampleXLLDynamic2-vc71-mt-0_1_4.lib" *************** *** 148,154 **** <Files> <File - RelativePath="addindynamic2.cpp"> - </File> - <File RelativePath="account.cpp"> </File> --- 148,151 ---- *************** *** 156,159 **** --- 153,159 ---- RelativePath="account.hpp"> </File> + <File + RelativePath="addindynamic2.cpp"> + </File> </Files> <Globals> Index: ExampleXllStatic.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/ExampleXllStatic.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExampleXllStatic.vcproj 19 May 2006 15:12:41 -0000 1.1 --- ExampleXllStatic.vcproj 1 Jun 2006 15:58:30 -0000 1.2 *************** *** 44,48 **** LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\..\xlsdk\lib,..\..\ohxl\ohxllib\lib,$(LOG4CXX_DIR)/msvc/lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\build\vc71\Debug/ExampleXLLStatic-vc71-mt-sgd-0_1_4.pdb" --- 44,48 ---- LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\build\vc71\Debug/ExampleXLLStatic-vc71-mt-sgd-0_1_4.pdb" *************** *** 112,116 **** LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\..\xlsdk\lib,..\..\ohxl\ohxllib\lib,$(LOG4CXX_DIR)/msvc/lib" ProgramDatabaseFile=".\build\vc71\Release/ExampleXLLStatic-vc71-mt-s-0_1_4.pdb" ImportLibrary=".\build\vc71\Release/ExampleXLLStatic-vc71-mt-s-0_1_4.lib" --- 112,116 ---- LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\lib" ProgramDatabaseFile=".\build\vc71\Release/ExampleXLLStatic-vc71-mt-s-0_1_4.pdb" ImportLibrary=".\build\vc71\Release/ExampleXLLStatic-vc71-mt-s-0_1_4.lib" *************** *** 179,183 **** LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\..\xlsdk\lib,..\..\ohxl\ohxllib\lib,$(LOG4CXX_DIR)/msvc/lib" ProgramDatabaseFile=".\build\vc71\ReleaseST/ExampleXLLStatic-vc71-s-0_1_4.pdb" ImportLibrary=".\build\vc71\ReleaseST/ExampleXLLStatic-vc71-s-0_1_4.lib" --- 179,183 ---- LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\lib" ProgramDatabaseFile=".\build\vc71\ReleaseST/ExampleXLLStatic-vc71-s-0_1_4.pdb" ImportLibrary=".\build\vc71\ReleaseST/ExampleXLLStatic-vc71-s-0_1_4.lib" *************** *** 245,249 **** LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\..\xlsdk\lib,..\..\ohxl\ohxllib\lib,$(LOG4CXX_DIR)/msvc/lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\build\vc71\DebugST/ExampleXLLStatic-vc71-sgd-0_1_4.pdb" --- 245,249 ---- LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\build\vc71\DebugST/ExampleXLLStatic-vc71-sgd-0_1_4.pdb" *************** *** 313,317 **** LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\..\xlsdk\lib,..\..\ohxl\ohxllib\lib,$(LOG4CXX_DIR)/msvc/lib" ProgramDatabaseFile=".\build\vc71\ReleaseCRTDLL/ExampleXLLStatic-vc71-mt-0_1_4.pdb" ImportLibrary=".\build\vc71\ReleaseCRTDLL/ExampleXLLStatic-vc71-mt-0_1_4.lib" --- 313,317 ---- LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\lib" ProgramDatabaseFile=".\build\vc71\ReleaseCRTDLL/ExampleXLLStatic-vc71-mt-0_1_4.pdb" ImportLibrary=".\build\vc71\ReleaseCRTDLL/ExampleXLLStatic-vc71-mt-0_1_4.lib" *************** *** 379,383 **** LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\..\xlsdk\lib,..\..\ohxl\ohxllib\lib,$(LOG4CXX_DIR)/msvc/lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\build\vc71\DebugCRTDLL/ExampleXLLStatic-vc71-mt-gd-0_1_4.pdb" --- 379,383 ---- LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\build\vc71\DebugCRTDLL/ExampleXLLStatic-vc71-mt-gd-0_1_4.pdb" *************** *** 418,424 **** <Files> <File - RelativePath="addinstatic.cpp"> - </File> - <File RelativePath="account.cpp"> </File> --- 418,421 ---- *************** *** 426,429 **** --- 423,429 ---- RelativePath="account.hpp"> </File> + <File + RelativePath="addinstatic.cpp"> + </File> </Files> <Globals> Index: ExampleXllDynamic1.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/ExampleXllDynamic1.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExampleXllDynamic1.vcproj 19 May 2006 15:12:41 -0000 1.1 --- ExampleXllDynamic1.vcproj 1 Jun 2006 15:58:30 -0000 1.2 *************** *** 44,48 **** LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\..\xlsdk\lib,..\..\ohxl\ohxll\xll" ProgramDatabaseFile=".\build\vc71\ReleaseCRTDLL/ExampleXLLDynamic1-vc71-mt-0_1_4.pdb" ImportLibrary=".\build\vc71\ReleaseCRTDLL/ExampleXLLDynamic1-vc71-mt-0_1_4.lib" --- 44,48 ---- LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\..\lib,..\..\xll" ProgramDatabaseFile=".\build\vc71\ReleaseCRTDLL/ExampleXLLDynamic1-vc71-mt-0_1_4.pdb" ImportLibrary=".\build\vc71\ReleaseCRTDLL/ExampleXLLDynamic1-vc71-mt-0_1_4.lib" *************** *** 109,113 **** LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\..\xlsdk\lib,..\..\ohxl\ohxll\xll" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\build\vc71\DebugCRTDLL/ExampleXLLDynamic1-vc71-mt-gd-0_1_4.pdb" --- 109,113 ---- LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\..\lib,..\..\xll" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\build\vc71\DebugCRTDLL/ExampleXLLDynamic1-vc71-mt-gd-0_1_4.pdb" *************** *** 148,154 **** <Files> <File - RelativePath="addindynamic1.cpp"> - </File> - <File RelativePath="account.cpp"> </File> --- 148,151 ---- *************** *** 156,159 **** --- 153,159 ---- RelativePath="account.hpp"> </File> + <File + RelativePath="addindynamic1.cpp"> + </File> </Files> <Globals> |
|
From: Ferdinando A. <na...@us...> - 2006-06-01 15:58:37
|
Update of /cvsroot/objecthandler/ObjectHandler/ohxl/ohxll In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28744/ohxl/ohxll Modified Files: ohxll.vcproj Log Message: VC7 catching up Index: ohxll.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/ohxll/ohxll.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ohxll.vcproj 19 May 2006 15:12:41 -0000 1.1 --- ohxll.vcproj 1 Jun 2006 15:58:30 -0000 1.2 *************** *** 13,18 **** <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory=".\xll" ! IntermediateDirectory=".\build\vc71\DebugCRTDLL" ConfigurationType="2" UseOfMFC="0" --- 13,18 ---- <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory="..\..\xll" ! IntermediateDirectory="..\..\build\vc71\ohxll\DebugCRTDLL" ConfigurationType="2" UseOfMFC="0" *************** *** 28,35 **** RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\DebugCRTDLL/ohxll.pch" ! AssemblerListingLocation=".\build\vc71\DebugCRTDLL/" ! ObjectFile=".\build\vc71\DebugCRTDLL/" ! ProgramDataBaseFileName=".\build\vc71\DebugCRTDLL/" BrowseInformation="1" WarningLevel="3" --- 28,35 ---- RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile="..\..\build\vc71\ohxll\DebugCRTDLL/ohxll.pch" ! AssemblerListingLocation="..\..\build\vc71\ohxll\DebugCRTDLL/" ! ObjectFile="..\..\build\vc71\ohxll\DebugCRTDLL/" ! ProgramDataBaseFileName="..\..\build\vc71\ohxll\DebugCRTDLL/" BrowseInformation="1" WarningLevel="3" *************** *** 42,52 **** Name="VCLinkerTool" AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib" ! OutputFile="xll\ObjectHandler-vc71-mt-gd-0_1_4.xll" LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\xlsdk\lib,$(LOG4CXX_DIR)\msvc\Lib" GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\xll/ObjectHandler-vc71-mt-gd-0_1_4.pdb" ! ImportLibrary=".\xll/ObjectHandler-vc71-mt-gd-0_1_4.lib" TargetMachine="1"/> <Tool --- 42,52 ---- Name="VCLinkerTool" AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib" ! OutputFile="..\..\xll\ObjectHandler-xll--vc71-mt-gd-0_1_4.xll" LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\Lib" GenerateDebugInformation="TRUE" ! ProgramDatabaseFile="..\..\xll\ObjectHandler-xll-vc71-mt-gd-0_1_4.pdb" ! ImportLibrary="..\..\xll\ObjectHandler-xll-vc71-mt-gd-0_1_4.lib" TargetMachine="1"/> <Tool *************** *** 81,86 **** <Configuration Name="Release CRTDLL|Win32" ! OutputDirectory=".\xll" ! IntermediateDirectory=".\build\vc71\ReleaseCRTDLL" ConfigurationType="2" UseOfMFC="0" --- 81,86 ---- <Configuration Name="Release CRTDLL|Win32" ! OutputDirectory="..\..\xll" ! IntermediateDirectory="..\..\build\vc71\ohxll\ReleaseCRTDLL" ConfigurationType="2" UseOfMFC="0" *************** *** 98,105 **** RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\ReleaseCRTDLL/ohxll.pch" ! AssemblerListingLocation=".\build\vc71\ReleaseCRTDLL/" ! ObjectFile=".\build\vc71\ReleaseCRTDLL/" ! ProgramDataBaseFileName=".\build\vc71\ReleaseCRTDLL/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 98,105 ---- RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile="..\..\build\vc71\ohxll\ReleaseCRTDLL/ohxll.pch" ! AssemblerListingLocation="..\..\build\vc71\ohxll\ReleaseCRTDLL/" ! ObjectFile="..\..\build\vc71\ohxll\ReleaseCRTDLL/" ! ProgramDataBaseFileName="..\..\build\vc71\ohxll\ReleaseCRTDLL/" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 110,119 **** Name="VCLinkerTool" AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib" ! OutputFile="xll\ObjectHandler-vc71-mt-0_1_4.xll" LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\xlsdk\lib,$(LOG4CXX_DIR)\msvc\Lib" ! ProgramDatabaseFile=".\xll/ObjectHandler-vc71-mt-0_1_4.pdb" ! ImportLibrary=".\xll/ObjectHandler-vc71-mt-0_1_4.lib" TargetMachine="1"/> <Tool --- 110,119 ---- Name="VCLinkerTool" AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib" ! OutputFile="..\..\xll\ObjectHandler-xll-vc71-mt-0_1_4.xll" LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\Lib" ! ProgramDatabaseFile="..\..\xll\ObjectHandler-xll-vc71-mt-0_1_4.pdb" ! ImportLibrary="..\..\xll\ObjectHandler-xll-vc71-mt-0_1_4.lib" TargetMachine="1"/> <Tool *************** *** 199,203 **** </File> <File ! RelativePath="..\..\oh\valueobject.hpp"> </File> </Filter> --- 199,203 ---- </File> <File ! RelativePath="..\..\oh\valueobject.hpp"> </File> </Filter> *************** *** 206,228 **** Filter=""> <File ! RelativePath="..\functioncall.cpp"> </File> <File ! RelativePath="..\functioncall.hpp"> </File> <File ! RelativePath="..\instancenamexl.cpp"> </File> <File ! RelativePath="..\instancenamexl.hpp"> </File> <File ! RelativePath="..\conversions.cpp"> </File> <File ! RelativePath="..\conversions.hpp"> </File> <File ! RelativePath="..\export.hpp"> </File> <File --- 206,228 ---- Filter=""> <File ! RelativePath="..\callingrange.cpp"> </File> <File ! RelativePath="..\callingrange.hpp"> </File> <File ! RelativePath="..\conversions.cpp"> </File> <File ! RelativePath="..\conversions.hpp"> </File> <File ! RelativePath="..\export.hpp"> </File> <File ! RelativePath="..\functioncall.cpp"> </File> <File ! RelativePath="..\functioncall.hpp"> </File> <File |
|
From: Ferdinando A. <na...@us...> - 2006-06-01 15:58:37
|
Update of /cvsroot/objecthandler/ObjectHandler In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28744 Modified Files: ohlib.vcproj Log Message: VC7 catching up Index: ohlib.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohlib.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ohlib.vcproj 19 May 2006 15:12:41 -0000 1.1 --- ohlib.vcproj 1 Jun 2006 15:58:30 -0000 1.2 *************** *** 13,18 **** <Configuration Name="Debug SingleThread|Win32" ! OutputDirectory=".\build\vc71\DebugST" ! IntermediateDirectory=".\build\vc71\DebugST" ConfigurationType="4" UseOfMFC="0" --- 13,18 ---- <Configuration Name="Debug SingleThread|Win32" ! OutputDirectory=".\build\vc71\oh\DebugST" ! IntermediateDirectory=".\build\vc71\oh\DebugST" ConfigurationType="4" UseOfMFC="0" *************** *** 65,70 **** <Configuration Name="Debug|Win32" ! OutputDirectory=".\build\vc71\Debug" ! IntermediateDirectory=".\build\vc71\Debug" ConfigurationType="4" UseOfMFC="0" --- 65,70 ---- <Configuration Name="Debug|Win32" ! OutputDirectory=".\build\vc71\oh\Debug" ! IntermediateDirectory=".\build\vc71\oh\Debug" ConfigurationType="4" UseOfMFC="0" *************** *** 80,87 **** RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\Debug/ohlib.pch" ! AssemblerListingLocation=".\build\vc71\Debug/" ! ObjectFile=".\build\vc71\Debug/" ! ProgramDataBaseFileName=".\build\vc71\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 80,87 ---- RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\oh\Debug/ohlib.pch" ! AssemblerListingLocation=".\build\vc71\oh\Debug/" ! ObjectFile=".\build\vc71\oh\Debug/" ! ProgramDataBaseFileName=".\build\vc71\oh\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 117,122 **** <Configuration Name="Release SingleThread|Win32" ! OutputDirectory=".\build\vc71\ReleaseST" ! IntermediateDirectory=".\build\vc71\ReleaseST" ConfigurationType="4" UseOfMFC="0" --- 117,122 ---- <Configuration Name="Release SingleThread|Win32" ! OutputDirectory=".\build\vc71\oh\ReleaseST" ! IntermediateDirectory=".\build\vc71\oh\ReleaseST" ConfigurationType="4" UseOfMFC="0" *************** *** 170,175 **** <Configuration Name="Release CRTDLL|Win32" ! OutputDirectory=".\build\vc71\ReleaseCRTDLL" ! IntermediateDirectory=".\build\vc71\ReleaseCRTDLL" ConfigurationType="4" UseOfMFC="0" --- 170,175 ---- <Configuration Name="Release CRTDLL|Win32" ! OutputDirectory=".\build\vc71\oh\ReleaseCRTDLL" ! IntermediateDirectory=".\build\vc71\oh\ReleaseCRTDLL" ConfigurationType="4" UseOfMFC="0" *************** *** 223,228 **** <Configuration Name="Release|Win32" ! OutputDirectory=".\build\vc71\Release" ! IntermediateDirectory=".\build\vc71\Release" ConfigurationType="4" UseOfMFC="0" --- 223,228 ---- <Configuration Name="Release|Win32" ! OutputDirectory=".\build\vc71\oh\Release" ! IntermediateDirectory=".\build\vc71\oh\Release" ConfigurationType="4" UseOfMFC="0" *************** *** 276,281 **** <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory=".\build\vc71\DebugCRTDLL" ! IntermediateDirectory=".\build\vc71\DebugCRTDLL" ConfigurationType="4" UseOfMFC="0" --- 276,281 ---- <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory=".\build\vc71\oh\DebugCRTDLL" ! IntermediateDirectory=".\build\vc71\oh\DebugCRTDLL" ConfigurationType="4" UseOfMFC="0" *************** *** 331,335 **** <Files> <File ! RelativePath="oh\autolink.hpp"> </File> <File --- 331,335 ---- <Files> <File ! RelativePath=".\oh\auto_link.hpp"> </File> <File |
|
From: Ferdinando A. <na...@us...> - 2006-06-01 15:58:36
|
Update of /cvsroot/objecthandler/ObjectHandler/xlsdk In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28744/xlsdk Modified Files: xlsdk.vcproj Log Message: VC7 catching up Index: xlsdk.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/xlsdk/xlsdk.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** xlsdk.vcproj 19 May 2006 15:12:41 -0000 1.1 --- xlsdk.vcproj 1 Jun 2006 15:58:30 -0000 1.2 *************** *** 13,18 **** <Configuration Name="Release|Win32" ! OutputDirectory=".\build\vc71\Release" ! IntermediateDirectory=".\build\vc71\Release" ConfigurationType="4" UseOfMFC="0" --- 13,18 ---- <Configuration Name="Release|Win32" ! OutputDirectory="..\build\vc71\xlsdk\Release" ! IntermediateDirectory="..\build\vc71\xlsdk\Release" ConfigurationType="4" UseOfMFC="0" *************** *** 30,37 **** RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\Release/xlsdk.pch" ! AssemblerListingLocation=".\build\vc71\Release/" ! ObjectFile=".\build\vc71\Release/" ! ProgramDataBaseFileName=".\build\vc71\Release/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 30,37 ---- RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile="..\build\vc71\xlsdk\Release/xlsdk.pch" ! AssemblerListingLocation="..\build\vc71\xlsdk\Release/" ! ObjectFile="..\build\vc71\xlsdk\Release/" ! ProgramDataBaseFileName="..\build\vc71\xlsdk\Release/" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 41,45 **** <Tool Name="VCLibrarianTool" ! OutputFile="lib\xlsdk-vc71-mt-s.lib" SuppressStartupBanner="TRUE"/> <Tool --- 41,45 ---- <Tool Name="VCLibrarianTool" ! OutputFile="..\lib\xlsdk-vc71-mt-s.lib" SuppressStartupBanner="TRUE"/> <Tool *************** *** 66,71 **** <Configuration Name="Debug SingleThread|Win32" ! OutputDirectory=".\build\vc71\DebugST" ! IntermediateDirectory=".\build\vc71\DebugST" ConfigurationType="4" UseOfMFC="0" --- 66,71 ---- <Configuration Name="Debug SingleThread|Win32" ! OutputDirectory="..\build\vc71\xlsdk\DebugST" ! IntermediateDirectory="..\build\vc71\xlsdk\DebugST" ConfigurationType="4" UseOfMFC="0" *************** *** 81,88 **** RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\DebugST/xlsdk.pch" ! AssemblerListingLocation=".\build\vc71\DebugST/" ! ObjectFile=".\build\vc71\DebugST/" ! ProgramDataBaseFileName=".\build\vc71\DebugST/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 81,88 ---- RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile="..\build\vc71\xlsdk\DebugST/xlsdk.pch" ! AssemblerListingLocation="..\build\vc71\xlsdk\DebugST/" ! ObjectFile="..\build\vc71\xlsdk\DebugST/" ! ProgramDataBaseFileName="..\build\vc71\xlsdk\DebugST/" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 93,97 **** <Tool Name="VCLibrarianTool" ! OutputFile="lib\xlsdk-vc71-sgd.lib" SuppressStartupBanner="TRUE"/> <Tool --- 93,97 ---- <Tool Name="VCLibrarianTool" ! OutputFile="..\lib\xlsdk-vc71-sgd.lib" SuppressStartupBanner="TRUE"/> <Tool *************** *** 118,123 **** <Configuration Name="Debug|Win32" ! OutputDirectory=".\build\vc71\Debug" ! IntermediateDirectory=".\build\vc71\Debug" ConfigurationType="4" UseOfMFC="0" --- 118,123 ---- <Configuration Name="Debug|Win32" ! OutputDirectory="..\build\vc71\xlsdk\Debug" ! IntermediateDirectory="..\build\vc71\xlsdk\Debug" ConfigurationType="4" UseOfMFC="0" *************** *** 133,140 **** RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\Debug/xlsdk.pch" ! AssemblerListingLocation=".\build\vc71\Debug/" ! ObjectFile=".\build\vc71\Debug/" ! ProgramDataBaseFileName=".\build\vc71\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 133,140 ---- RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile="..\build\vc71\xlsdk\Debug/xlsdk.pch" ! AssemblerListingLocation="..\build\vc71\xlsdk\Debug/" ! ObjectFile="..\build\vc71\xlsdk\Debug/" ! ProgramDataBaseFileName="..\build\vc71\xlsdk\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 145,149 **** <Tool Name="VCLibrarianTool" ! OutputFile="lib\xlsdk-vc71-mt-sgd.lib" SuppressStartupBanner="TRUE"/> <Tool --- 145,149 ---- <Tool Name="VCLibrarianTool" ! OutputFile="..\lib\xlsdk-vc71-mt-sgd.lib" SuppressStartupBanner="TRUE"/> <Tool *************** *** 170,175 **** <Configuration Name="Release CRTDLL|Win32" ! OutputDirectory=".\build\vc71\ReleaseCRTDLL" ! IntermediateDirectory=".\build\vc71\ReleaseCRTDLL" ConfigurationType="4" UseOfMFC="0" --- 170,175 ---- <Configuration Name="Release CRTDLL|Win32" ! OutputDirectory="..\build\vc71\xlsdk\ReleaseCRTDLL" ! IntermediateDirectory="..\build\vc71\xlsdk\ReleaseCRTDLL" ConfigurationType="4" UseOfMFC="0" *************** *** 187,194 **** RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\ReleaseCRTDLL/xlsdk.pch" ! AssemblerListingLocation=".\build\vc71\ReleaseCRTDLL/" ! ObjectFile=".\build\vc71\ReleaseCRTDLL/" ! ProgramDataBaseFileName=".\build\vc71\ReleaseCRTDLL/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 187,194 ---- RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile="..\build\vc71\xlsdk\ReleaseCRTDLL/xlsdk.pch" ! AssemblerListingLocation="..\build\vc71\xlsdk\ReleaseCRTDLL/" ! ObjectFile="..\build\vc71\xlsdk\ReleaseCRTDLL/" ! ProgramDataBaseFileName="..\build\vc71\xlsdk\ReleaseCRTDLL/" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 198,202 **** <Tool Name="VCLibrarianTool" ! OutputFile="lib\xlsdk-vc71-mt.lib" SuppressStartupBanner="TRUE"/> <Tool --- 198,202 ---- <Tool Name="VCLibrarianTool" ! OutputFile="..\lib\xlsdk-vc71-mt.lib" SuppressStartupBanner="TRUE"/> <Tool *************** *** 223,228 **** <Configuration Name="Release SingleThread|Win32" ! OutputDirectory=".\build\vc71\ReleaseST" ! IntermediateDirectory=".\build\vc71\ReleaseST" ConfigurationType="4" UseOfMFC="0" --- 223,228 ---- <Configuration Name="Release SingleThread|Win32" ! OutputDirectory="..\build\vc71\xlsdk\ReleaseST" ! IntermediateDirectory="..\build\vc71\xlsdk\ReleaseST" ConfigurationType="4" UseOfMFC="0" *************** *** 240,247 **** RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\ReleaseST/xlsdk.pch" ! AssemblerListingLocation=".\build\vc71\ReleaseST/" ! ObjectFile=".\build\vc71\ReleaseST/" ! ProgramDataBaseFileName=".\build\vc71\ReleaseST/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 240,247 ---- RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile="..\build\vc71\xlsdk\ReleaseST/xlsdk.pch" ! AssemblerListingLocation="..\build\vc71\xlsdk\ReleaseST/" ! ObjectFile="..\build\vc71\xlsdk\ReleaseST/" ! ProgramDataBaseFileName="..\build\vc71\xlsdk\ReleaseST/" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 251,255 **** <Tool Name="VCLibrarianTool" ! OutputFile="lib\xlsdk-vc71-s.lib" SuppressStartupBanner="TRUE"/> <Tool --- 251,255 ---- <Tool Name="VCLibrarianTool" ! OutputFile="..\lib\xlsdk-vc71-s.lib" SuppressStartupBanner="TRUE"/> <Tool *************** *** 276,281 **** <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory=".\build\vc71\DebugCRTDLL" ! IntermediateDirectory=".\build\vc71\DebugCRTDLL" ConfigurationType="4" UseOfMFC="0" --- 276,281 ---- <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory="..\build\vc71\xlsdk\DebugCRTDLL" ! IntermediateDirectory="..\build\vc71\xlsdk\DebugCRTDLL" ConfigurationType="4" UseOfMFC="0" *************** *** 291,298 **** RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\DebugCRTDLL/xlsdk.pch" ! AssemblerListingLocation=".\build\vc71\DebugCRTDLL/" ! ObjectFile=".\build\vc71\DebugCRTDLL/" ! ProgramDataBaseFileName=".\build\vc71\DebugCRTDLL/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 291,298 ---- RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile="..\build\vc71\xlsdk\DebugCRTDLL/xlsdk.pch" ! AssemblerListingLocation="..\build\vc71\xlsdk\DebugCRTDLL/" ! ObjectFile="..\build\vc71\xlsdk\DebugCRTDLL/" ! ProgramDataBaseFileName="..\build\vc71\xlsdk\DebugCRTDLL/" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 303,307 **** <Tool Name="VCLibrarianTool" ! OutputFile="lib\xlsdk-vc71-mt-gd.lib" SuppressStartupBanner="TRUE"/> <Tool --- 303,307 ---- <Tool Name="VCLibrarianTool" ! OutputFile="..\lib\xlsdk-vc71-mt-gd.lib" SuppressStartupBanner="TRUE"/> <Tool *************** *** 331,335 **** <Files> <File ! RelativePath="autolink.hpp"> </File> <File --- 331,335 ---- <Files> <File ! RelativePath=".\auto_link.hpp"> </File> <File |
|
From: Eric E. <eri...@us...> - 2006-06-01 14:07:04
|
Update of /cvsroot/objecthandler/ObjectHandler/Examples/xl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13820/Examples/xl Modified Files: addindynamic1.cpp addinstatic.cpp Log Message: update examples Index: addindynamic1.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/addindynamic1.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** addindynamic1.cpp 31 May 2006 18:29:57 -0000 1.3 --- addindynamic1.cpp 1 Jun 2006 14:06:54 -0000 1.4 *************** *** 20,24 **** #include <xlsdk/xlsdk.hpp> #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 --- 20,23 ---- *************** *** 71,77 **** char *accountType) { try { - ObjHandler::FunctionCall functionCall; - ObjHandler::FunctionCall::instance().clearCell(); - ObjHandler::obj_ptr objectPointer(new AccountObject( *accountNumber, --- 70,73 ---- Index: addinstatic.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/addinstatic.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** addinstatic.cpp 1 Jun 2006 13:40:42 -0000 1.4 --- addinstatic.cpp 1 Jun 2006 14:06:54 -0000 1.5 *************** *** 21,25 **** #include <ohxl/register.hpp> #include <ohxl/export.hpp> - #include <ohxl/functioncall.hpp> #include <oh/objhandler.hpp> /* Use BOOST_MSVC instead of _MSC_VER since some other vendors (Metrowerks, --- 21,24 ---- *************** *** 83,89 **** char *accountType) { try { - ObjHandler::FunctionCall functionCall; - ObjHandler::FunctionCall::instance().clearCell(); - ObjHandler::obj_ptr objectPointer(new AccountObject( *accountNumber, --- 82,85 ---- |
|
From: Eric E. <eri...@us...> - 2006-06-01 13:59:52
|
Update of /cvsroot/objecthandler/ObjectHandler/ohxl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11165/ohxl Modified Files: conversions.hpp objecthandlerxl.hpp register.cpp unregister.cpp Log Message: change "handle" to "instance name" Index: objecthandlerxl.hpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/objecthandlerxl.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** objecthandlerxl.hpp 1 Jun 2006 10:52:08 -0000 1.2 --- objecthandlerxl.hpp 1 Jun 2006 13:59:47 -0000 1.3 *************** *** 38,42 **** class ObjectHandlerXL : public ObjectHandlerBase { public: ! //! Store Object with given handle. /*! This function is optimized for the base case where the calling range contains a single formula. --- 38,42 ---- class ObjectHandlerXL : public ObjectHandlerBase { public: ! //! Store Object with given instance name. /*! This function is optimized for the base case where the calling range contains a single formula. Index: register.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/register.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** register.cpp 19 May 2006 15:12:41 -0000 1.1 --- register.cpp 1 Jun 2006 13:59:47 -0000 1.2 *************** *** 64,68 **** TempStrNoSize("\x00"""), // path to help file TempStrNoSize("\x2D""retrieve the property names of a given object"), // function description ! TempStrNoSize("\x2E""handle of existing ObjHandler::Object object ")); // description of parameter 1 Excel(xlfRegister, 0, 13, &xDll, --- 64,68 ---- TempStrNoSize("\x00"""), // path to help file TempStrNoSize("\x2D""retrieve the property names of a given object"), // function description ! TempStrNoSize("\x35""instance name of existing ObjHandler::Object object ")); // description of parameter 1 Excel(xlfRegister, 0, 13, &xDll, *************** *** 76,80 **** TempStrNoSize("\x00"""), // path to help file TempStrNoSize("\x26""retrieve the value of a named property"), // function description ! TempStrNoSize("\x2C""handle of existing ObjHandler::Object object"), // description of parameter 1 TempStrNoSize("\x10""name of property"), // description of parameter 2 TempStrNoSize("\x1D""dependency tracking trigger ")); // description of parameter 3 --- 76,80 ---- TempStrNoSize("\x00"""), // path to help file TempStrNoSize("\x26""retrieve the value of a named property"), // function description ! TempStrNoSize("\x33""instance name of existing ObjHandler::Object object"), // description of parameter 1 TempStrNoSize("\x10""name of property"), // description of parameter 2 TempStrNoSize("\x1D""dependency tracking trigger ")); // description of parameter 3 *************** *** 90,94 **** TempStrNoSize("\x00"""), // path to help file TempStrNoSize("\x1D""delete object from repository"),// function description ! TempStrNoSize("\x20""handle of object to be deleted "));// description param 0 Excel(xlfRegister, 0, 10, &xDll, --- 90,94 ---- TempStrNoSize("\x00"""), // path to help file TempStrNoSize("\x1D""delete object from repository"),// function description ! TempStrNoSize("\x27""instance name of object to be deleted "));// description param 0 Excel(xlfRegister, 0, 10, &xDll, *************** *** 206,210 **** TempStrNoSize("\x00"""), // path to help file TempStrNoSize("\x24""write object description to log file"),// function description ! TempStrNoSize("\x1F""handle of object to be logged "));// description param 0 Excel(xlfRegister, 0, 10, &xDll, --- 206,210 ---- TempStrNoSize("\x00"""), // path to help file TempStrNoSize("\x24""write object description to log file"),// function description ! TempStrNoSize("\x26""instance name of object to be logged "));// description param 0 Excel(xlfRegister, 0, 10, &xDll, Index: conversions.hpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/conversions.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** conversions.hpp 25 May 2006 16:59:51 -0000 1.3 --- conversions.hpp 1 Jun 2006 13:59:47 -0000 1.4 *************** *** 27,31 **** namespace ObjHandler { - DLL_API std::string getHandleFull(const std::string &handle); DLL_API void stringToChar(char *c, const std::string &s); --- 27,30 ---- Index: unregister.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/unregister.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** unregister.cpp 19 May 2006 15:12:41 -0000 1.1 --- unregister.cpp 1 Jun 2006 13:59:47 -0000 1.2 *************** *** 69,73 **** TempStrNoSize("\x00"""), // path to help file TempStrNoSize("\x2D""retrieve the property names of a given object"), // function description ! TempStrNoSize("\x2E""handle of existing ObjHandler::Object object ")); // description of parameter 1 Excel(xlfRegister, 0, 13, &xDll, --- 69,73 ---- TempStrNoSize("\x00"""), // path to help file TempStrNoSize("\x2D""retrieve the property names of a given object"), // function description ! TempStrNoSize("\x35""instance name of existing ObjHandler::Object object ")); // description of parameter 1 Excel(xlfRegister, 0, 13, &xDll, *************** *** 81,85 **** TempStrNoSize("\x00"""), // path to help file TempStrNoSize("\x26""retrieve the value of a named property"), // function description ! TempStrNoSize("\x2C""handle of existing ObjHandler::Object object"), // description of parameter 1 TempStrNoSize("\x10""name of property"), // description of parameter 2 TempStrNoSize("\x1D""dependency tracking trigger ")); // description of parameter 3 --- 81,85 ---- TempStrNoSize("\x00"""), // path to help file TempStrNoSize("\x26""retrieve the value of a named property"), // function description ! TempStrNoSize("\x33""instance name of existing ObjHandler::Object object"), // description of parameter 1 TempStrNoSize("\x10""name of property"), // description of parameter 2 TempStrNoSize("\x1D""dependency tracking trigger ")); // description of parameter 3 *************** *** 95,99 **** TempStrNoSize("\x00"""), // path to help file TempStrNoSize("\x1F""delete object from repository "),// function description ! TempStrNoSize("\x20""handle of object to be deleted "));// description param 0 Excel(xlfRegister, 0, 10, &xDll, --- 95,99 ---- TempStrNoSize("\x00"""), // path to help file TempStrNoSize("\x1F""delete object from repository "),// function description ! TempStrNoSize("\x27""instance name of object to be deleted "));// description param 0 Excel(xlfRegister, 0, 10, &xDll, *************** *** 211,215 **** TempStrNoSize("\x00"""), // path to help file TempStrNoSize("\x24""write object description to log file"),// function description ! TempStrNoSize("\x1F""handle of object to be logged "));// description param 0 Excel(xlfRegister, 0, 10, &xDll, --- 211,215 ---- TempStrNoSize("\x00"""), // path to help file TempStrNoSize("\x24""write object description to log file"),// function description ! TempStrNoSize("\x26""instance name of object to be logged "));// description param 0 Excel(xlfRegister, 0, 10, &xDll, |
|
From: Eric E. <eri...@us...> - 2006-06-01 13:59:50
|
Update of /cvsroot/objecthandler/ObjectHandler/oh In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11165/oh Modified Files: object.hpp objecthandlerbase.cpp objecthandlerbase.hpp utilities.cpp utilities.hpp Log Message: change "handle" to "instance name" Index: utilities.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/oh/utilities.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** utilities.cpp 19 May 2006 15:12:41 -0000 1.1 --- utilities.cpp 1 Jun 2006 13:59:47 -0000 1.2 *************** *** 36,41 **** DLL_API ObjHandler::obj_ptr retrieveObject( ! const std::string &handle) { ! return ObjectHandler::instance().retrieveObject(handle); } --- 36,41 ---- DLL_API ObjHandler::obj_ptr retrieveObject( ! const std::string &instanceName) { ! return ObjectHandler::instance().retrieveObject(instanceName); } *************** *** 66,78 **** } ! void logObject(const std::string &handle) { std::ostringstream msg; obj_ptr object = ! ObjectHandler::instance().retrieveObject(handle); if (object) { ! msg << "log dump of object with handle = " << handle << std::endl; msg << *object.get(); } else { ! msg << "no object in repository with handle = " << handle << std::endl; } Logger::instance().logMessage(msg.str()); --- 66,78 ---- } ! void logObject(const std::string &instanceName) { std::ostringstream msg; obj_ptr object = ! ObjectHandler::instance().retrieveObject(instanceName); if (object) { ! msg << "log dump of object with instance name = " << instanceName << std::endl; msg << *object.get(); } else { ! msg << "no object in repository with instance name = " << instanceName << std::endl; } Logger::instance().logMessage(msg.str()); Index: objecthandlerbase.hpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/oh/objecthandlerbase.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** objecthandlerbase.hpp 1 Jun 2006 10:52:08 -0000 1.2 --- objecthandlerbase.hpp 1 Jun 2006 13:59:47 -0000 1.3 *************** *** 47,61 **** //! \name storing / retrieving / deleting Objects //@{ ! //! Store Object with given handle. ! /*! Any existing Object with that handle is deleted. */ virtual std::string storeObject(const std::string &instanceName, const obj_ptr &object); ! //! Retrieve Object with given handle. ! /*! Throws exception if no Object exists with that handle. */ virtual obj_ptr retrieveObject(const std::string &instanceName) const; ! //! Delete Object with given handle. ! /*! Does nothing if no Object exists with that handle. */ virtual void deleteObject(const std::string &instanceName); --- 47,61 ---- //! \name storing / retrieving / deleting Objects //@{ ! //! Store Object with given instance name. ! /*! Any existing Object with that instance name is deleted. */ virtual std::string storeObject(const std::string &instanceName, const obj_ptr &object); ! //! Retrieve Object with given instance name. ! /*! Throws exception if no Object exists with that instance name. */ virtual obj_ptr retrieveObject(const std::string &instanceName) const; ! //! Delete Object with given instance name. ! /*! Does nothing if no Object exists with that instance name. */ virtual void deleteObject(const std::string &instanceName); Index: utilities.hpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/oh/utilities.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** utilities.hpp 19 May 2006 15:12:41 -0000 1.1 --- utilities.hpp 1 Jun 2006 13:59:47 -0000 1.2 *************** *** 28,40 **** //! ObjectHandler function retrieveObject /*! Declare boost shared pointer with name \a NAME and point it to ! Object having class \a CLIENT_CLASS and handle \a HANDLE. */ ! #define OH_GET_OBJECT( NAME, HANDLE, CLIENT_CLASS ) \ boost::shared_ptr < CLIENT_CLASS > NAME = \ boost::dynamic_pointer_cast< CLIENT_CLASS > \ ! (ObjHandler::retrieveObject( HANDLE )); \ if (!NAME) { \ std::ostringstream err; \ ! err << "Unable to convert handle " << HANDLE \ << " to object of class " #CLIENT_CLASS; \ throw ObjHandler::Exception(err.str()); \ --- 28,40 ---- //! ObjectHandler function retrieveObject /*! Declare boost shared pointer with name \a NAME and point it to ! Object having class \a CLIENT_CLASS and instance name \a INSTANCENAME. */ ! #define OH_GET_OBJECT( NAME, INSTANCENAME, CLIENT_CLASS ) \ boost::shared_ptr < CLIENT_CLASS > NAME = \ boost::dynamic_pointer_cast< CLIENT_CLASS > \ ! (ObjHandler::retrieveObject( INSTANCENAME )); \ if (!NAME) { \ std::ostringstream err; \ ! err << "Unable to convert instance name " << INSTANCENAME \ << " to object of class " #CLIENT_CLASS; \ throw ObjHandler::Exception(err.str()); \ *************** *** 44,51 **** /*! Declare a boost shared pointer with name \a NAME and point it to object of class \a UNDERLYING_CLASS retrieved from Object ! having class \a CLIENT_CLASS and handle \a HANDLE. */ ! #define OH_GET_REFERENCE( NAME, HANDLE, CLIENT_CLASS, UNDERLYING_CLASS ) \ ! OH_GET_OBJECT(NAME ## temp, HANDLE, CLIENT_CLASS ) \ const boost::shared_ptr< UNDERLYING_CLASS > NAME = \ boost::static_pointer_cast< UNDERLYING_CLASS > \ --- 44,51 ---- /*! Declare a boost shared pointer with name \a NAME and point it to object of class \a UNDERLYING_CLASS retrieved from Object ! having class \a CLIENT_CLASS and instance name \a INSTANCENAME. */ ! #define OH_GET_REFERENCE( NAME, INSTANCENAME, CLIENT_CLASS, UNDERLYING_CLASS ) \ ! OH_GET_OBJECT(NAME ## temp, INSTANCENAME, CLIENT_CLASS ) \ const boost::shared_ptr< UNDERLYING_CLASS > NAME = \ boost::static_pointer_cast< UNDERLYING_CLASS > \ *************** *** 56,61 **** enum AnyError { InvalidInput, CaughtException }; ! //! Store given Object in repository under given handle. ! /*! Any existing Objet with that handle is deleted. */ DLL_API std::string storeObject( --- 56,61 ---- enum AnyError { InvalidInput, CaughtException }; ! //! Store given Object in repository under given instance name. ! /*! Any existing Objet with that instance name is deleted. */ DLL_API std::string storeObject( *************** *** 64,71 **** //! Retrieve named Object from repository. ! /*! Throws an exception if no Object exists with given handle. */ DLL_API ObjHandler::obj_ptr retrieveObject( ! const std::string &handle); //! Retrieve ObjectHandler version string --- 64,71 ---- //! Retrieve named Object from repository. ! /*! Throws an exception if no Object exists with given instance name. */ DLL_API ObjHandler::obj_ptr retrieveObject( ! const std::string &instanceName); //! Retrieve ObjectHandler version string *************** *** 106,114 **** const int &logLevel = 4); ! //! Write Object with given handle to log file. /*! Writes a warning message to log file ! if no object is found with given handle. */ ! void logObject(const std::string &handle); //! Write all Objects to log file. --- 106,114 ---- const int &logLevel = 4); ! //! Write Object with given instance name to log file. /*! Writes a warning message to log file ! if no object is found with given instance name. */ ! void logObject(const std::string &instanceName); //! Write all Objects to log file. Index: objecthandlerbase.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/oh/objecthandlerbase.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** objecthandlerbase.cpp 1 Jun 2006 10:52:08 -0000 1.3 --- objecthandlerbase.cpp 1 Jun 2006 13:59:47 -0000 1.4 *************** *** 60,64 **** i!=objectList_.end(); i++) { obj_ptr object = i->second; ! out << "Object with handle = " << i->first << ":" << std::endl << *object.get(); } } --- 60,64 ---- i!=objectList_.end(); i++) { obj_ptr object = i->second; ! out << "Object with instanceName = " << i->first << ":" << std::endl << *object.get(); } } Index: object.hpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/oh/object.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** object.hpp 1 Jun 2006 10:52:08 -0000 1.2 --- object.hpp 1 Jun 2006 13:59:47 -0000 1.3 *************** *** 50,54 **** /*! Construct an Object. To store the resulting Object in the ObjectHandler, call ! ObjectHandler::instance().storeObject(handle, object); */ Object() {}; --- 50,54 ---- /*! Construct an Object. To store the resulting Object in the ObjectHandler, call ! ObjectHandler::instance().storeObject(instanceName, object); */ Object() {}; |
|
From: Ferdinando A. <na...@us...> - 2006-06-01 13:40:46
|
Update of /cvsroot/objecthandler/ObjectHandler/Examples/xl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4112/Examples/xl Modified Files: addinstatic.cpp Log Message: catching up Index: addinstatic.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/addinstatic.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** addinstatic.cpp 25 May 2006 17:01:56 -0000 1.3 --- addinstatic.cpp 1 Jun 2006 13:40:42 -0000 1.4 *************** *** 21,25 **** #include <ohxl/register.hpp> #include <ohxl/export.hpp> - #include <ohxl/instancenamexl.hpp> #include <ohxl/functioncall.hpp> #include <oh/objhandler.hpp> --- 21,24 ---- |
|
From: Ferdinando A. <na...@us...> - 2006-06-01 13:28:53
|
Update of /cvsroot/objecthandler/ObjectHandler/Examples/C++ In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32280/Examples/C++ Modified Files: ExampleCpp_vc8.vcproj Log Message: Index: ExampleCpp_vc8.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/C++/ExampleCpp_vc8.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ExampleCpp_vc8.vcproj 25 May 2006 10:45:34 -0000 1.2 --- ExampleCpp_vc8.vcproj 1 Jun 2006 13:28:49 -0000 1.3 *************** *** 45,49 **** Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories=".,..\..,$(LOG4CXX_DIR)\include" PreprocessorDefinitions="NDEBUG;_CONSOLE;LOG4CXX_STATIC;WIN32" StringPooling="true" --- 45,49 ---- Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories=".,..\.." PreprocessorDefinitions="NDEBUG;_CONSOLE;LOG4CXX_STATIC;WIN32" StringPooling="true" *************** *** 137,141 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories=".,..\..,$(LOG4CXX_DIR)\include" PreprocessorDefinitions="_DEBUG;_CONSOLE;LOG4CXX_STATIC;WIN32" MinimalRebuild="true" --- 137,141 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories=".,..\.." PreprocessorDefinitions="_DEBUG;_CONSOLE;LOG4CXX_STATIC;WIN32" MinimalRebuild="true" *************** *** 232,236 **** Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories=".,..\..,$(LOG4CXX_DIR)\include" PreprocessorDefinitions="NDEBUG;_CONSOLE;LOG4CXX_STATIC;WIN32" StringPooling="true" --- 232,236 ---- Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories=".,..\.." PreprocessorDefinitions="NDEBUG;_CONSOLE;LOG4CXX_STATIC;WIN32" StringPooling="true" *************** *** 324,328 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories=".,..\..,$(LOG4CXX_DIR)\include" PreprocessorDefinitions="_DEBUG;_CONSOLE;LOG4CXX_STATIC;WIN32" MinimalRebuild="true" --- 324,328 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories=".,..\.." PreprocessorDefinitions="_DEBUG;_CONSOLE;LOG4CXX_STATIC;WIN32" MinimalRebuild="true" |
|
From: Eric E. <eri...@us...> - 2006-06-01 13:26:00
|
Update of /cvsroot/objecthandler/ObjectHandler/ohxl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31118/ohxl Modified Files: conversions.cpp Log Message: fix typographical error Index: conversions.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/conversions.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** conversions.cpp 1 Jun 2006 10:52:08 -0000 1.3 --- conversions.cpp 1 Jun 2006 13:25:53 -0000 1.4 *************** *** 261,265 **** if (stringLength < 0) stringLength += 257; if (stringLength) ! ret.assign(xString->val.str + 1, x); if (needToFree) --- 261,265 ---- if (stringLength < 0) stringLength += 257; if (stringLength) ! ret.assign(xString->val.str + 1, stringLength); if (needToFree) |
|
From: Eric E. <eri...@us...> - 2006-06-01 10:52:14
|
Update of /cvsroot/objecthandler/ObjectHandler/ohxl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2303/ohxl Modified Files: conversions.cpp functioncall.cpp functioncall.hpp functions.cpp objecthandlerxl.cpp objecthandlerxl.hpp Added Files: callingrange.cpp callingrange.hpp Removed Files: instancenamexl.cpp instancenamexl.hpp Log Message: revise processing for instance names Index: objecthandlerxl.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/objecthandlerxl.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** objecthandlerxl.cpp 25 May 2006 17:01:57 -0000 1.2 --- objecthandlerxl.cpp 1 Jun 2006 10:52:08 -0000 1.3 *************** *** 18,23 **** #include <oh/exception.hpp> #include <ohxl/objecthandlerxl.hpp> ! #include <ohxl/instancenamexl.hpp> #include <ohxl/conversions.hpp> /* Use BOOST_MSVC instead of _MSC_VER since some other vendors (Metrowerks, for example) also #define _MSC_VER --- 18,24 ---- #include <oh/exception.hpp> #include <ohxl/objecthandlerxl.hpp> ! #include <ohxl/callingrange.hpp> #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 *************** *** 32,114 **** #include <sstream> #include <cmath> - #include <boost/regex.hpp> namespace ObjHandler { ! std::string ObjectHandlerXL::storeObject(const std::string &instanceName, ! const obj_ptr &object) { ! object->setInstanceName(boost::shared_ptr < Object::InstanceName > (new InstanceNameXL(instanceName))); ! std::string fullName = object->getFullName(); ! objectList_[fullName] = object; ! return fullName; ! } ! void ObjectHandlerXL::collectGarbage() { ! ObjectList::iterator iter_current, iter_previous; ! iter_current = objectList_.begin(); ! while (iter_current != objectList_.end()) { ! iter_previous = iter_current; ! iter_current++; ! std::string nameFull = iter_previous->first; ! obj_ptr object = iter_previous->second; ! if (!object->isValid()) ! objectList_.erase(nameFull); ! } ! } ! void ObjectHandlerXL::deleteKey(const std::string &key) { ! for (ObjectList::iterator iter = objectList_.begin(); ! iter != objectList_.end(); iter++) { ! std::string nameFull = iter->first; ! obj_ptr object = iter->second; ! if (object->getKey() == key) { ! objectList_.erase(nameFull); ! break; ! } ! } ! } ! bool ObjectHandlerXL::nameIsFull(const std::string &name) const { ! static const boost::regex NAME_REGEX(".*~_[\\da-f]{5}"); ! return regex_match(name, NAME_REGEX); ! } ! obj_ptr ObjectHandlerXL::retrieveObjectNameStub(const std::string &nameStub) const { ! bool objectFound = false; ! std::string nameFullFound; ! obj_ptr retrievedObject; ! ObjectList::const_iterator i; ! for (i=objectList_.begin(); i!=objectList_.end(); i++) { ! std::string nameFull = i->first; ! obj_ptr object = i->second; ! if (nameStub == object->getStubName()) { ! if (objectFound) { std::ostringstream msg; ! msg << "error retrieving object with instance name '" << nameStub ! << "': two (& maybe more) objects exist with that instance name -" ! << " #1: '" << nameFullFound ! << "' #2: '" << nameFull << "'"; throw Exception(msg.str()); } else { ! retrievedObject = object; ! objectFound = true; ! nameFullFound = nameFull; } } } if (i != objectList_.end()) { std::ostringstream msg; ! msg << "ObjectHandler error: attempt to retrieve object " ! "with unknown instance name '" << nameStub << "'"; throw Exception(msg.str()); ! } else ! return retrievedObject; } ! obj_ptr ObjectHandlerXL::retrieveObject(const std::string &name) const { ! if (nameIsFull(name)) ! return ObjectHandlerBase::retrieveObject(name); else ! return retrieveObjectNameStub(name); } --- 33,164 ---- #include <sstream> #include <cmath> namespace ObjHandler { ! int ObjectHandlerXL::instanceNameCount_ = 0; ! boost::shared_ptr < CallingRange > ObjectHandlerXL::getCallingRange() { ! ! // XLOPERs which might need freeing in the event of an exception ! XLOPER xOldName; ! XLOPER xValue; ! try { ! boost::shared_ptr < CallingRange > callingRange; ! // get name if any ! ! Excel(xlfGetDef, &xOldName, 1, FunctionCall::instance().getCallerAddress()); ! ! // if name - return associated CallingRange object ! ! if (xOldName.xltype == xltypeStr) { ! std::string oldKey; ! operToScalar(oldKey, xOldName); ! Excel(xlFree, 0, 1, &xOldName); ! std::map < std::string, boost::shared_ptr < CallingRange > >::const_iterator i; ! i = callingRanges_.find(oldKey); ! if (i == callingRanges_.end()) { std::ostringstream msg; ! msg << "no calling range named " << oldKey; throw Exception(msg.str()); } else { ! callingRange = i->second; ! callingRange->update(); } } + + return callingRange; + + } catch (const std::exception &e) { + + // free any memory that may have been allocated + + Excel(xlFree, 0, 2, &xOldName, &xValue); + + // propagate the exception + + std::ostringstream err; + err << "ObjectHandlerXL::getCallingRange(): " << e.what(); + throw Exception(err.str()); } + + } + + void ObjectHandlerXL::resetCaller() { + getCallingRange(); + } + + std::string ObjectHandlerXL::storeObject( + const std::string &instanceName, + const obj_ptr &object) { + boost::shared_ptr < CallingRange > callingRange = getCallingRange(); + + if (!callingRange) { + callingRange = boost::shared_ptr < CallingRange >(new CallingRange); + callingRanges_[callingRange->getKey()] = callingRange; + } + + std::string instanceNameDerived; + if (instanceName.empty()) + instanceNameDerived = generateInstanceName(); + else + instanceNameDerived = instanceName; + + ObjectList::const_iterator i = objectList_.find(instanceNameDerived); if (i != objectList_.end()) { std::ostringstream msg; ! msg << "unable to instantiate object with instance name '" << instanceNameDerived ! << "' because another object with that instance name already exists."; throw Exception(msg.str()); ! } ! ! callingRange->registerObject(instanceNameDerived); ! ! std::string instanceNameCounter = ObjectHandlerBase::storeObject(instanceNameDerived, object); ! return instanceNameCounter + "#" + callingRange->updateCount(); } ! obj_ptr ObjectHandlerXL::retrieveObject(const std::string &instanceName) const { ! std::string instanceNameStub; ! int counterOffset = instanceName.length() - 5; ! if (counterOffset >= 0 && instanceName[counterOffset] == '#') ! instanceNameStub = instanceName.substr(0, counterOffset); else ! instanceNameStub = instanceName; ! return ObjectHandlerBase::retrieveObject(instanceNameStub); ! } ! ! std::string ObjectHandlerXL::generateInstanceName() { ! static const int COUNT_WIDTH = 5; ! static const int COUNT_BASE = 16; ! static const double COUNT_MAX = pow((double)COUNT_BASE, COUNT_WIDTH); ! ! if (instanceNameCount_ > COUNT_MAX) ! throw Exception("ObjectHandlerXL::generateInstanceName: max count value exceeded"); ! std::ostringstream s; ! s << "obj_" << std::setw(COUNT_WIDTH) << std::setfill('0') << std::setbase(COUNT_BASE) << instanceNameCount_++; ! return s.str(); ! } ! ! void ObjectHandlerXL::collectGarbage() { ! std::map < std::string, boost::shared_ptr < CallingRange > >::const_iterator iter_current, iter_previous; ! iter_current = callingRanges_.begin(); ! while (iter_current != callingRanges_.end()) { ! iter_previous = iter_current; ! iter_current++; ! std::string key = iter_previous->first; ! boost::shared_ptr < CallingRange > callingRange = iter_previous->second; ! if (!callingRange->isValid()) { ! callingRange->clear(); ! callingRanges_.erase(key); ! } ! } ! } ! ! void ObjectHandlerXL::deleteAllObjects() { ! callingRanges_.clear(); ! ObjectHandlerBase::deleteAllObjects(); } Index: objecthandlerxl.hpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/objecthandlerxl.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** objecthandlerxl.hpp 19 May 2006 15:12:41 -0000 1.1 --- objecthandlerxl.hpp 1 Jun 2006 10:52:08 -0000 1.2 *************** *** 20,25 **** */ ! #ifndef oh_objecthandlerxl_hpp ! #define oh_objecthandlerxl_hpp #include <oh/objecthandlerbase.hpp> --- 20,25 ---- */ ! #ifndef ohxl_objecthandlerxl_hpp ! #define ohxl_objecthandlerxl_hpp #include <oh/objecthandlerbase.hpp> *************** *** 29,32 **** --- 29,34 ---- */ namespace ObjHandler { + class CallingRange; + //! Global Object repository. /*! Maintains a repository of Objects. *************** *** 36,47 **** class ObjectHandlerXL : public ObjectHandlerBase { public: virtual std::string storeObject(const std::string &instanceName, const obj_ptr &object); ! virtual obj_ptr retrieveObject(const std::string &name) const; virtual void collectGarbage(); ! void deleteKey(const std::string &key); private: ! bool nameIsFull(const std::string &name) const; ! obj_ptr retrieveObjectNameStub(const std::string &nameStub) const; }; --- 38,71 ---- class ObjectHandlerXL : public ObjectHandlerBase { public: + //! Store Object with given handle. + /*! This function is optimized for the base case where the calling range + contains a single formula. + + Additional behavior is supported: + - multiple functions nested within a single calling range - with the + possibility that functions to construct Objects are intermixed with + functions from another source e.g. Excel or some other user addin + - "anonymous objects" i.e. the user has not supplied an instance name + and a default value is generated + + Performance in such special cases is sub-optimal. + */ virtual std::string storeObject(const std::string &instanceName, const obj_ptr &object); ! virtual obj_ptr retrieveObject(const std::string &instanceName) const; virtual void collectGarbage(); ! virtual void deleteAllObjects(); ! //! Reset the calling cell. ! /*! This function resets the status of the calling cell to "not busy" and ! should be called by non-constructor functions in case they wrap constructors ! which set the caller's status to "busy". ! */ ! virtual void resetCaller(); private: ! std::map < std::string, boost::shared_ptr < CallingRange > > callingRanges_; ! boost::shared_ptr < CallingRange > getCallingRange(); ! virtual std::string generateInstanceName(); ! void clearCallingRange(boost::shared_ptr < CallingRange > callingRange); ! static int instanceNameCount_; }; --- NEW FILE: callingrange.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. */ /*! \file \brief CallingRange class */ #ifndef ohxl_callingrange_hpp #define ohxl_callingrange_hpp #include <oh/object.hpp> namespace ObjHandler { class CallingRange { public: CallingRange(); ~CallingRange(); bool isValid(); const std::string &getKey() { return key_; } void registerObject(const std::string &instanceName); void clear(); void update(); std::string updateCount(); private: static int keyCount_; static std::string getKeyCount(); std::string key_; std::vector < std::string > residentObjects_; bool busy_; int updateCount_; }; } #endif --- instancenamexl.cpp DELETED --- Index: conversions.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/conversions.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** conversions.cpp 25 May 2006 16:59:51 -0000 1.2 --- conversions.cpp 1 Jun 2006 10:52:08 -0000 1.3 *************** *** 252,257 **** } ! if (xString->val.str[0]) ! ret.assign(xString->val.str + 1, xString->val.str[0]); if (needToFree) --- 252,265 ---- } ! //if (xString->val.str[0]) ! // ret.assign(xString->val.str + 1, xString->val.str[0]); ! ! // expirimental workaround for apparent bug in Excel API ! // where the value for the string length wraps around the byte ! ! int stringLength = xString->val.str[0]; ! if (stringLength < 0) stringLength += 257; ! if (stringLength) ! ret.assign(xString->val.str + 1, x); if (needToFree) Index: functions.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/functions.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** functions.cpp 19 May 2006 15:12:41 -0000 1.1 --- functions.cpp 1 Jun 2006 10:52:08 -0000 1.2 *************** *** 129,133 **** OPER *dummy9) { try { ! ObjHandler::FunctionCall functionCall; static std::map < std::string, long > iterators; static long ret; --- 129,133 ---- OPER *dummy9) { try { ! ObjHandler::FunctionCall functionCall("ohDependsOn"); static std::map < std::string, long > iterators; static long ret; Index: functioncall.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/functioncall.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** functioncall.cpp 25 May 2006 16:59:51 -0000 1.2 --- functioncall.cpp 1 Jun 2006 10:52:08 -0000 1.3 *************** *** 21,30 **** #include <ohxl/conversions.hpp> #include <sstream> namespace ObjHandler { ! FunctionCall *FunctionCall::instance_ = 0; ! FunctionCall::FunctionCall() { if (instance_) throw Exception("Multiple attempts to initialize global FunctionCall object"); --- 21,36 ---- #include <ohxl/conversions.hpp> #include <sstream> + #include <string> namespace ObjHandler { ! FunctionCall *FunctionCall::instance_ = 0; ! // FIXME these values need to be configured at runtime ! const std::string libFunctionSignature = "=ql"; ! const std::string libName = "QuantLib"; ! ! FunctionCall::FunctionCall(const std::string functionName) ! : functionName_(functionName) { if (instance_) throw Exception("Multiple attempts to initialize global FunctionCall object"); *************** *** 64,67 **** --- 70,74 ---- Excel(xlfGetCell, &xAddress, 2, TempNum(1), getCallerReference()); operToScalar(address_, xAddress); + Excel(xlFree, 0, 1, &xAddress); } catch (const std::exception &e) { Excel(xlFree, 0, 1, &xAddress); *************** *** 74,120 **** } ! void FunctionCall::clearCell() { ! ! // XLOPERs which might need freeing in the event of an exception ! ! XLOPER xOldName; ! XLOPER xValue; ! ! try { ! ! // exit if calling cell is #VALUE ! ! Excel(xlfGetCell, &xValue, 2, TempNum(5), getCallerReference()); ! if (xValue.xltype & xltypeErr) return; ! Excel(xlFree, 0, 1, &xValue); ! ! // get name if any ! ! Excel(xlfGetDef, &xOldName, 1, getCallerAddress()); ! ! // if name - delete associated object ! ! if (xOldName.xltype == xltypeStr) { ! std::string oldKey; ! operToScalar(oldKey, xOldName); ! ObjectHandler::instance().deleteKey(oldKey); } ! Excel(xlFree, 0, 1, &xOldName); ! ! } catch (const std::exception &e) { ! ! // free any memory that may have been allocated ! Excel(xlFree, 0, 2, &xOldName, &xValue); ! // propagate the exception ! std::ostringstream err; ! err << "FunctionCall::clearCell(): " << e.what(); ! throw Exception(err.str()); } - } } - --- 81,136 ---- } ! const std::string &FunctionCall::getFormula() { ! if (formula_.empty()) { ! XLOPER xFormula; ! try { ! Excel(xlfGetFormula, &xFormula, 1, getCallerReference()); ! operToScalar(formula_, xFormula); ! Excel(xlFree, 0, 1, &xFormula); ! } catch (const std::exception &e) { ! Excel(xlFree, 0, 1, &xFormula); ! std::ostringstream err; ! err << "FunctionCall::getFormula(): " << e.what(); ! throw Exception(err.str()); } ! } ! return formula_; ! } ! bool FunctionCall::outerFunction() { ! // exit if calling cell is #VALUE ! //XLOPER xValue; ! //Excel(xlfGetCell, &xValue, 2, TempNum(5), getCallerReference()); ! //if (xValue.xltype & (xltypeErr | xltypeMissing)) { ! // return false; ! //} ! //Excel(xlFree, 0, 1, &xValue); ! std::string formula = getFormula(); ! std::string functionNameCompare = "=" + functionName_ + "("; ! if (formula.substr(0, functionNameCompare.length()) == functionNameCompare) { ! if (formula.find(functionName_, functionNameCompare.length()) != std::string::npos) { ! std::ostringstream err; ! err << "Function '" << functionName_ << "' appears in formula '" << formula ! << "' as both the outermost function and as an inner function. " ! << "ObjectHandler cannot handle cell formulas in which a given function " ! << "is nested within itself as this circumvents garbage collection. " ! << "Please split this formula into separate cells."; ! throw Exception(err.str()); ! } ! return true; ! } else { ! if (formula.substr(0, libFunctionSignature.length()) != libFunctionSignature) { ! std::ostringstream err; ! err << "in formula '" << formula << "' - " << libName << " function '" << functionName_ ! << "' is nested within a non-" << libName << " function. ObjectHandler cannot handle " ! << "library functions nested within non-library functions as this circumvents garbage " ! << "collection. Please split this formula into separate cells."; ! throw Exception(err.str()); ! } ! return false; } } } --- NEW FILE: callingrange.cpp --- /* 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. */ #include <ohxl/callingrange.hpp> #include <ohxl/conversions.hpp> #include <ohxl/functioncall.hpp> #include <oh/objecthandler.hpp> #include <oh/exception.hpp> #include <iostream> #include <iomanip> #include <sstream> #include <cmath> namespace ObjHandler { int CallingRange::keyCount_ = 0; std::string CallingRange::getKeyCount() { static const int KEY_WIDTH = 5; static const int KEY_BASE = 16; static const double KEY_MAX = pow((double)KEY_BASE, KEY_WIDTH); if (keyCount_ > KEY_MAX) throw Exception("CallingRange::getKeyCount: max key value exceeded"); std::ostringstream s; s << '_' << std::setw(KEY_WIDTH) << std::setfill('0') << std::setbase(KEY_BASE) << keyCount_++; return s.str(); } CallingRange::CallingRange() : busy_(false), updateCount_(0) { // name the calling range key_ = getKeyCount(); const XLOPER *xCaller = FunctionCall::instance().getCallerReference(); XLOPER xRet; Excel(xlfSetName, &xRet, 2, TempStrStl(key_), xCaller); if (xRet.xltype != xltypeBool || !xRet.val.boolean) throw Exception("error on call to xlfSetName"); } CallingRange::~CallingRange() { // unname the calling range Excel(xlfSetName, 0, 1, TempStrStl(key_)); } void CallingRange::clear() { std::vector < std::string >::const_iterator i; for (i = residentObjects_.begin(); i != residentObjects_.end(); i++) { std::string instanceName = *i; ObjectHandler::instance().deleteObject(instanceName); } residentObjects_.clear(); } void CallingRange::registerObject(const std::string &instanceName) { residentObjects_.push_back(instanceName); } bool CallingRange::isValid() { // XLOPERs which might need freeing in the event of an exception XLOPER xDef; XLOPER xRef; try { Excel(xlfGetName, &xDef, 1, TempStrStl(key_)); std::string address; operToScalar(address, xDef); Excel(xlfTextref, &xRef, 1, TempStrStl(address.substr(1))); bool ret = (xRef.xltype & (xltypeRef | xltypeSRef)) != 0; Excel(xlFree, 0, 2, &xDef, &xRef); return ret; } catch (const std::exception &e) { // free any memory that may have been allocated Excel(xlFree, 0, 2, &xDef, &xRef); // propagate the exception std::ostringstream err; err << "CallingRange::isValid: " << e.what(); throw Exception(err.str()); } } void CallingRange::update() { /* support for nested formulas e.g. "=qlFunc1(qlFunc2(), SUM(), qlFunc3(), xxx)" implement the following algorithm: - on first call to this formula - mark calling range as "busy" - clear() - intermediate calls - take no action - final call - mark calling range as "not busy" */ if (FunctionCall::instance().outerFunction()) { if (busy_) { busy_ = false; } else { clear(); } } else { if (busy_) { return; } else { busy_ = true; clear(); } } } std::string CallingRange::updateCount() { if (updateCount_ > 9999) updateCount_ = 0; std::ostringstream s; s << std::setw(4) << std::setfill('0') << updateCount_++; return s.str(); } } --- instancenamexl.hpp DELETED --- Index: functioncall.hpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/functioncall.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** functioncall.hpp 19 May 2006 15:12:41 -0000 1.1 --- functioncall.hpp 1 Jun 2006 10:52:08 -0000 1.2 *************** *** 20,25 **** */ ! #ifndef oh_functioncall_hpp ! #define oh_functioncall_hpp #include <xlsdk/xlsdkdefines.hpp> --- 20,25 ---- */ ! #ifndef ohxl_functioncall_hpp ! #define ohxl_functioncall_hpp #include <xlsdk/xlsdkdefines.hpp> *************** *** 38,48 **** class DLL_API FunctionCall { public: ! FunctionCall(); ~FunctionCall(); static FunctionCall &instance(); - void clearCell(); const XLOPER *getCallerReference(); const XLOPER *getCallerAddress(); const std::string &getAddressString(); private: static FunctionCall *instance_; --- 38,49 ---- class DLL_API FunctionCall { public: ! FunctionCall(const std::string functionName); ~FunctionCall(); static FunctionCall &instance(); const XLOPER *getCallerReference(); const XLOPER *getCallerAddress(); const std::string &getAddressString(); + const std::string &getFormula(); + bool outerFunction(); private: static FunctionCall *instance_; *************** *** 50,53 **** --- 51,56 ---- XLOPER xReftext; std::string address_; + std::string formula_; + std::string functionName_; }; |
|
From: Eric E. <eri...@us...> - 2006-06-01 10:52:12
|
Update of /cvsroot/objecthandler/ObjectHandler/ohxl/ohxllib In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2303/ohxl/ohxllib Modified Files: ohxllib_vc8.vcproj Log Message: revise processing for instance names Index: ohxllib_vc8.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/ohxllib/ohxllib_vc8.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ohxllib_vc8.vcproj 25 May 2006 17:01:57 -0000 1.3 --- ohxllib_vc8.vcproj 1 Jun 2006 10:52:08 -0000 1.4 *************** *** 394,426 **** > <File ! RelativePath="..\conversions.cpp" > </File> <File ! RelativePath="..\conversions.hpp" > </File> <File ! RelativePath="..\export.hpp" > </File> <File ! RelativePath="..\functioncall.cpp" > </File> <File ! RelativePath="..\functioncall.hpp" > </File> <File ! RelativePath="..\functions.cpp" > </File> <File ! RelativePath="..\instancenamexl.cpp" > </File> <File ! RelativePath="..\instancenamexl.hpp" > </File> --- 394,426 ---- > <File ! RelativePath="..\callingrange.cpp" > </File> <File ! RelativePath="..\callingrange.hpp" > </File> <File ! RelativePath="..\conversions.cpp" > </File> <File ! RelativePath="..\conversions.hpp" > </File> <File ! RelativePath="..\export.hpp" > </File> <File ! RelativePath="..\functioncall.cpp" > </File> <File ! RelativePath="..\functioncall.hpp" > </File> <File ! RelativePath="..\functions.cpp" > </File> |
|
From: Eric E. <eri...@us...> - 2006-06-01 10:52:12
|
Update of /cvsroot/objecthandler/ObjectHandler/oh In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2303/oh Modified Files: object.hpp objecthandlerbase.cpp objecthandlerbase.hpp Log Message: revise processing for instance names Index: objecthandlerbase.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/oh/objecthandlerbase.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** objecthandlerbase.cpp 25 May 2006 10:45:35 -0000 1.2 --- objecthandlerbase.cpp 1 Jun 2006 10:52:08 -0000 1.3 *************** *** 32,46 **** std::string ObjectHandlerBase::storeObject(const std::string &instanceName, const obj_ptr &object) { - object->setInstanceName(boost::shared_ptr < Object::InstanceName > (new Object::InstanceName(instanceName))); objectList_[instanceName] = object; return instanceName; } ! obj_ptr ObjectHandlerBase::retrieveObject(const std::string &fullName) const { ! ObjectList::const_iterator result = objectList_.find(fullName); if (result == objectList_.end()) { std::ostringstream msg; msg << "ObjectHandler error: attempt to retrieve object " ! << "with unknown instance name '" << fullName << "'"; throw Exception(msg.str()); } else --- 32,45 ---- std::string ObjectHandlerBase::storeObject(const std::string &instanceName, const obj_ptr &object) { objectList_[instanceName] = object; return instanceName; } ! obj_ptr ObjectHandlerBase::retrieveObject(const std::string &instanceName) const { ! ObjectList::const_iterator result = objectList_.find(instanceName); if (result == objectList_.end()) { std::ostringstream msg; msg << "ObjectHandler error: attempt to retrieve object " ! << "with unknown instance name '" << instanceName << "'"; throw Exception(msg.str()); } else *************** *** 48,53 **** } ! void ObjectHandlerBase::deleteObject(const std::string &fullName) { ! objectList_.erase(fullName); } --- 47,52 ---- } ! void ObjectHandlerBase::deleteObject(const std::string &instanceName) { ! objectList_.erase(instanceName); } *************** *** 77,82 **** boost::regex r(regex); for (ObjectList::const_iterator i=objectList_.begin(); i!=objectList_.end(); i++) { ! std::string stubName = i->second->getStubName(); ! if (regex_match(stubName, r)) instanceNames.push_back(stubName); } } --- 76,81 ---- boost::regex r(regex); for (ObjectList::const_iterator i=objectList_.begin(); i!=objectList_.end(); i++) { ! std::string instanceName = i->first; ! if (regex_match(instanceName, r)) instanceNames.push_back(instanceName); } } Index: object.hpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/oh/object.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** object.hpp 19 May 2006 15:12:41 -0000 1.1 --- object.hpp 1 Jun 2006 10:52:08 -0000 1.2 *************** *** 45,75 **** class Object { public: - //! Processing for the identifier for this Object. - /*! This base class is empty and may be overridden - to provide platform-specific behavior. - */ - class InstanceName { - public: - InstanceName(const std::string &fullName) : fullName_(fullName) {} - virtual ~InstanceName() {} - const std::string &getStubName() { - return stubName_; - } - const std::string &getFullName() { - return fullName_; - } - const std::string &getKey() { - return key_; - } - virtual bool isValid() { - return true; - } - protected: - InstanceName() {} - std::string stubName_; - std::string fullName_; - std::string key_; - }; - //! \name Constructors & Destructors //@{ --- 45,48 ---- *************** *** 104,128 **** mProps = p; } - - void setInstanceName(const boost::shared_ptr < InstanceName > &instanceName) { - instanceName_ = instanceName; - } - const std::string &getStubName() { - return instanceName_->getStubName(); - } - const std::string &getFullName() { - return instanceName_->getFullName(); - } - const std::string &getKey() { - return instanceName_->getKey(); - } - bool isValid() { - return instanceName_->isValid(); - } private: boost::shared_ptr<ValueObject> mProps; Object& operator= (const Object&); Object(const Object&); - boost::shared_ptr< InstanceName > instanceName_; }; --- 77,84 ---- Index: objecthandlerbase.hpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/oh/objecthandlerbase.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** objecthandlerbase.hpp 19 May 2006 15:12:41 -0000 1.1 --- objecthandlerbase.hpp 1 Jun 2006 10:52:08 -0000 1.2 *************** *** 55,63 **** /*! Throws exception if no Object exists with that handle. */ ! virtual obj_ptr retrieveObject(const std::string &fullName) const; //! Delete Object with given handle. /*! Does nothing if no Object exists with that handle. */ ! virtual void deleteObject(const std::string &fullName); //! Delete all Objects in repository. /*! Does nothing if repository is already empty. --- 55,63 ---- /*! Throws exception if no Object exists with that handle. */ ! virtual obj_ptr retrieveObject(const std::string &instanceName) const; //! Delete Object with given handle. /*! Does nothing if no Object exists with that handle. */ ! virtual void deleteObject(const std::string &instanceName); //! Delete all Objects in repository. /*! Does nothing if repository is already empty. |
|
From: Eric E. <eri...@us...> - 2006-06-01 10:52:12
|
Update of /cvsroot/objecthandler/ObjectHandler/ohxl/ohxll In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2303/ohxl/ohxll Modified Files: ohxll_vc8.vcproj Log Message: revise processing for instance names Index: ohxll_vc8.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/ohxll/ohxll_vc8.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ohxll_vc8.vcproj 25 May 2006 10:19:01 -0000 1.4 --- ohxll_vc8.vcproj 1 Jun 2006 10:52:08 -0000 1.5 *************** *** 285,317 **** > <File ! RelativePath="..\conversions.cpp" > </File> <File ! RelativePath="..\conversions.hpp" > </File> <File ! RelativePath="..\export.hpp" > </File> <File ! RelativePath="..\functioncall.cpp" > </File> <File ! RelativePath="..\functioncall.hpp" > </File> <File ! RelativePath="..\functions.cpp" > </File> <File ! RelativePath="..\instancenamexl.cpp" > </File> <File ! RelativePath="..\instancenamexl.hpp" > </File> --- 285,317 ---- > <File ! RelativePath="..\callingrange.cpp" > </File> <File ! RelativePath="..\callingrange.hpp" > </File> <File ! RelativePath="..\conversions.cpp" > </File> <File ! RelativePath="..\conversions.hpp" > </File> <File ! RelativePath="..\export.hpp" > </File> <File ! RelativePath="..\functioncall.cpp" > </File> <File ! RelativePath="..\functioncall.hpp" > </File> <File ! RelativePath="..\functions.cpp" > </File> |
|
From: Ferdinando A. <na...@us...> - 2006-05-31 18:30:02
|
Update of /cvsroot/objecthandler/ObjectHandler/Examples/xl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25059/Examples/xl Modified Files: addindynamic1.cpp addindynamic2.cpp Log Message: proper auto_linking Index: addindynamic1.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/addindynamic1.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** addindynamic1.cpp 25 May 2006 17:01:56 -0000 1.2 --- addindynamic1.cpp 31 May 2006 18:29:57 -0000 1.3 *************** *** 27,31 **** # define BOOST_LIB_DIAGNOSTIC # include <oh/auto_link.hpp> - # include <xlsdk/auto_link.hpp> # undef BOOST_LIB_DIAGNOSTIC #endif --- 27,30 ---- Index: addindynamic2.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/addindynamic2.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** addindynamic2.cpp 25 May 2006 17:01:56 -0000 1.2 --- addindynamic2.cpp 31 May 2006 18:29:57 -0000 1.3 *************** *** 26,30 **** # define BOOST_LIB_DIAGNOSTIC # include <oh/auto_link.hpp> - # include <xlsdk/auto_link.hpp> # undef BOOST_LIB_DIAGNOSTIC #endif --- 26,29 ---- |
|
From: Eric E. <eri...@us...> - 2006-05-31 09:44:18
|
Update of /cvsroot/objecthandler/ObjectHandler/oh In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22377/oh Modified Files: logger.cpp Log Message: fix spelling of "log4cxx/auto_link.hpp" to correspond with that of file in repository Index: logger.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/oh/logger.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** logger.cpp 31 May 2006 09:10:20 -0000 1.7 --- logger.cpp 31 May 2006 09:44:14 -0000 1.8 *************** *** 28,32 **** #ifdef BOOST_MSVC # define BOOST_LIB_DIAGNOSTIC ! # include <log4cxx/autolink.hpp> # undef BOOST_LIB_DIAGNOSTIC #endif --- 28,32 ---- #ifdef BOOST_MSVC # define BOOST_LIB_DIAGNOSTIC ! # include <log4cxx/auto_link.hpp> # undef BOOST_LIB_DIAGNOSTIC #endif |
|
From: Eric E. <eri...@us...> - 2006-05-31 09:10:24
|
Update of /cvsroot/objecthandler/ObjectHandler/oh In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7376/oh Modified Files: logger.cpp Log Message: fix spelling of "log4cxx/autolink.hpp" to correspond with that of file in repository Index: logger.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/oh/logger.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** logger.cpp 30 May 2006 10:03:04 -0000 1.6 --- logger.cpp 31 May 2006 09:10:20 -0000 1.7 *************** *** 28,32 **** #ifdef BOOST_MSVC # define BOOST_LIB_DIAGNOSTIC ! # include <log4cxx/auto_link.hpp> # undef BOOST_LIB_DIAGNOSTIC #endif --- 28,32 ---- #ifdef BOOST_MSVC # define BOOST_LIB_DIAGNOSTIC ! # include <log4cxx/autolink.hpp> # undef BOOST_LIB_DIAGNOSTIC #endif |
|
From: Ferdinando A. <na...@us...> - 2006-05-30 11:39:11
|
Update of /cvsroot/objecthandler/ObjectHandler In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4799 Modified Files: ObjectHandler_vc8.sln Log Message: dependency added Index: ObjectHandler_vc8.sln =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ObjectHandler_vc8.sln,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ObjectHandler_vc8.sln 25 May 2006 17:01:56 -0000 1.2 --- ObjectHandler_vc8.sln 30 May 2006 11:39:03 -0000 1.3 *************** *** 9,24 **** Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExampleXllDynamic1", "Examples\xl\ExampleXllDynamic1_vc8.vcproj", "{CFC78C89-EFD2-400A-8860-40320E6FCA60}" ProjectSection(ProjectDependencies) = postProject - {4BD77A1E-AAE9-47A4-81FE-2308E5A460AF} = {4BD77A1E-AAE9-47A4-81FE-2308E5A460AF} {04D7369F-47BC-46B0-A374-41635A9656D8} = {04D7369F-47BC-46B0-A374-41635A9656D8} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExampleXllDynamic2", "Examples\xl\ExampleXllDynamic2_vc8.vcproj", "{F89760C1-CD0C-4138-A6A7-A8528A1B0D6F}" ProjectSection(ProjectDependencies) = postProject - {4BD77A1E-AAE9-47A4-81FE-2308E5A460AF} = {4BD77A1E-AAE9-47A4-81FE-2308E5A460AF} {04D7369F-47BC-46B0-A374-41635A9656D8} = {04D7369F-47BC-46B0-A374-41635A9656D8} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExampleXllStatic", "Examples\xl\ExampleXllStatic_vc8.vcproj", "{687DB6AF-730F-4740-B20A-B95EA8180E8D}" ProjectSection(ProjectDependencies) = postProject {66021664-4359-442C-ACC7-7C82F51C9D5A} = {66021664-4359-442C-ACC7-7C82F51C9D5A} EndProjectSection --- 9,25 ---- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExampleXllDynamic1", "Examples\xl\ExampleXllDynamic1_vc8.vcproj", "{CFC78C89-EFD2-400A-8860-40320E6FCA60}" ProjectSection(ProjectDependencies) = postProject {04D7369F-47BC-46B0-A374-41635A9656D8} = {04D7369F-47BC-46B0-A374-41635A9656D8} + {4BD77A1E-AAE9-47A4-81FE-2308E5A460AF} = {4BD77A1E-AAE9-47A4-81FE-2308E5A460AF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExampleXllDynamic2", "Examples\xl\ExampleXllDynamic2_vc8.vcproj", "{F89760C1-CD0C-4138-A6A7-A8528A1B0D6F}" ProjectSection(ProjectDependencies) = postProject {04D7369F-47BC-46B0-A374-41635A9656D8} = {04D7369F-47BC-46B0-A374-41635A9656D8} + {4BD77A1E-AAE9-47A4-81FE-2308E5A460AF} = {4BD77A1E-AAE9-47A4-81FE-2308E5A460AF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExampleXllStatic", "Examples\xl\ExampleXllStatic_vc8.vcproj", "{687DB6AF-730F-4740-B20A-B95EA8180E8D}" ProjectSection(ProjectDependencies) = postProject + {4BD77A1E-AAE9-47A4-81FE-2308E5A460AF} = {4BD77A1E-AAE9-47A4-81FE-2308E5A460AF} {66021664-4359-442C-ACC7-7C82F51C9D5A} = {66021664-4359-442C-ACC7-7C82F51C9D5A} EndProjectSection |
|
From: Ferdinando A. <na...@us...> - 2006-05-30 11:17:22
|
Update of /cvsroot/objecthandler/log4cxx-0.9.7 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26261 Modified Files: log4cxx.nsi Log Message: auto_linking Index: log4cxx.nsi =================================================================== RCS file: /cvsroot/objecthandler/log4cxx-0.9.7/log4cxx.nsi,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** log4cxx.nsi 30 May 2006 10:10:54 -0000 1.1 --- log4cxx.nsi 30 May 2006 11:16:51 -0000 1.2 *************** *** 45,48 **** --- 45,49 ---- File /r "*.vcproj" File /r "*.h" + File /r "*.hpp" File /r "*.cpp" File /r "*.am" |
|
From: Ferdinando A. <na...@us...> - 2006-05-30 11:17:22
|
Update of /cvsroot/objecthandler/log4cxx-0.9.7/include/log4cxx In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26261/include/log4cxx Modified Files: auto_link.hpp Log Message: auto_linking Index: auto_link.hpp =================================================================== RCS file: /cvsroot/objecthandler/log4cxx-0.9.7/include/log4cxx/auto_link.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** auto_link.hpp 30 May 2006 10:02:23 -0000 1.1 --- auto_link.hpp 30 May 2006 11:16:51 -0000 1.2 *************** *** 61,67 **** #pragma comment(lib, LOG4CXX_LIB_NAME) ! //#ifdef BOOST_LIB_DIAGNOSTIC # pragma message("Linking to lib file: " LOG4CXX_LIB_NAME) ! //#endif #endif --- 61,67 ---- #pragma comment(lib, LOG4CXX_LIB_NAME) ! #ifdef BOOST_LIB_DIAGNOSTIC # pragma message("Linking to lib file: " LOG4CXX_LIB_NAME) ! #endif #endif |
|
From: Ferdinando A. <na...@us...> - 2006-05-30 10:54:56
|
Update of /cvsroot/objecthandler/log4cxx-0.9.7/msvc/static In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15283/msvc/static Modified Files: .cvsignore Log Message: Index: .cvsignore =================================================================== RCS file: /cvsroot/objecthandler/log4cxx-0.9.7/msvc/static/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .cvsignore 30 May 2006 10:10:54 -0000 1.2 --- .cvsignore 30 May 2006 10:54:51 -0000 1.3 *************** *** 1,8 **** *.user vc80 ! Debug ! Release Unicode_R - Debug CRTDLL - Release CRTDLL Unicode_D --- 1,6 ---- *.user vc80 ! Debug* ! Release* Unicode_R Unicode_D |
|
From: Ferdinando A. <na...@us...> - 2006-05-30 10:11:05
|
Update of /cvsroot/objecthandler/log4cxx-0.9.7 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28107 Added Files: log4cxx.nsi Log Message: adding installer --- NEW FILE: log4cxx.nsi --- # to be used with NSIS 2.0 and up SetCompressor lzma !define VER_NUMBER "0.9.7" !define /date NOW "%Y%m%d-%H_%M" # HEADER CONFIGURATION COMMANDS Name "log4cxx" Caption "log4cxx - Setup" #do not change the name below OutFile "..\log4cxx-oh-${VER_NUMBER}-${NOW}.exe" SilentInstall normal CRCCheck on LicenseText "log4cxx is released under the following license:" LicenseData license.apl DirText "Please select a location to install log4cxx (or use the default):" InstallDir $PROGRAMFILES\log4cxx-${VER_NUMBER} InstallDirRegKey HKEY_LOCAL_MACHINE SOFTWARE\log4cxx-${VER_NUMBER} "Install_Dir" AutoCloseWindow false ShowInstDetails hide SetDateSave on # INSTALLATION EXECUTION COMMANDS Section "-log4cxx-oh" # this directory must be created first, or the CreateShortCut will not work CreateDirectory "$SMPROGRAMS\log4cxx-oh-${VER_NUMBER}" SetOutPath $INSTDIR # these MUST be present File "AUTHORS" File "COPYING" File "INSTALL" File "license.apl" File "NEWS" File "README" File "*.nsi" File /r "*.sln" File /r "*.vcproj" File /r "*.h" File /r "*.cpp" File /r "*.am" WriteRegStr HKEY_LOCAL_MACHINE \ "Software\Microsoft\Windows\CurrentVersion\Uninstall\log4cxx-oh-${VER_NUMBER}" \ "DisplayName" "log4cxx-oh ${VER_NUMBER} (remove only)" WriteRegStr HKEY_LOCAL_MACHINE \ "Software\Microsoft\Windows\CurrentVersion\Uninstall\log4cxx-oh-${VER_NUMBER}" \ "UninstallString" '"log4cxx-oh_Uninstall.exe"' WriteRegStr HKEY_CURRENT_USER "Environment" "LOG4CXX_DIR" "$INSTDIR" WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\log4cxx-oh-${VER_NUMBER}" \ "Install_Dir" "$INSTDIR" CreateShortCut "$SMPROGRAMS\log4cxx-oh-${VER_NUMBER}\Uninstall log4cxx-oh.lnk" \ "$INSTDIR\log4cxx-oh_Uninstall.exe" "" \ "$INSTDIR\log4cxx-oh_Uninstall.exe" 0 CreateShortCut "$SMPROGRAMS\log4cxx-oh-${VER_NUMBER}\AUTHORS.lnk" \ "$INSTDIR\AUTHORS" CreateShortCut "$SMPROGRAMS\log4cxx-oh-${VER_NUMBER}\COPYING.lnk" \ "$INSTDIR\COPYING" CreateShortCut "$SMPROGRAMS\log4cxx-oh-${VER_NUMBER}\INSTALL.lnk" \ "$INSTDIR\INSTALL" CreateShortCut "$SMPROGRAMS\log4cxx-oh-${VER_NUMBER}\NEWS.lnk" \ "$INSTDIR\NEWS" CreateShortCut "$SMPROGRAMS\log4cxx-oh-${VER_NUMBER}\README.lnk" \ "$INSTDIR\README" CreateShortCut "$SMPROGRAMS\log4cxx-oh-${VER_NUMBER}\License.lnk" \ "$INSTDIR\license.apl" CreateShortCut "$SMPROGRAMS\log4cxx-oh-${VER_NUMBER}\log4cxx-oh VC 7 project workspace.lnk" \ "$INSTDIR\msvc\log4cxx.sln" CreateShortCut "$SMPROGRAMS\log4cxx-oh-${VER_NUMBER}\log4cxx-oh VC 8 project workspace.lnk" \ "$INSTDIR\msvc\log4cxx_vc8.sln" CreateShortCut "$SMPROGRAMS\log4cxx-oh-${VER_NUMBER}\log4cxx-oh Folder.lnk" \ "$INSTDIR" WriteINIStr "$SMPROGRAMS\log4cxx-oh-${VER_NUMBER}\log4cxx-ObjectHandler Home Page.url" \ "InternetShortcut" "URL" "http://sourceforge.net/projects/objecthandler" WriteUninstaller "log4cxx-oh_Uninstall.exe" SectionEnd UninstallText "This will uninstall log4cxx-oh. Hit next to continue." Section "Uninstall" DeleteRegKey HKEY_LOCAL_MACHINE \ "Software\Microsoft\Windows\CurrentVersion\Uninstall\log4cxx-oh-${VER_NUMBER}" DeleteRegKey HKEY_LOCAL_MACHINE SOFTWARE\log4cxx-oh-${VER_NUMBER} DeleteRegValue HKEY_CURRENT_USER "Environment" "LOG4CXX_DIR" RMDir /r /REBOOTOK "$SMPROGRAMS\log4cxx-oh-${VER_NUMBER}" RMDir /r /REBOOTOK "$INSTDIR" SectionEnd |
|
From: Ferdinando A. <na...@us...> - 2006-05-30 10:10:57
|
Update of /cvsroot/objecthandler/log4cxx-0.9.7/msvc/static In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28107/msvc/static Modified Files: .cvsignore Log Message: adding installer Index: .cvsignore =================================================================== RCS file: /cvsroot/objecthandler/log4cxx-0.9.7/msvc/static/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 25 May 2006 16:03:58 -0000 1.1 --- .cvsignore 30 May 2006 10:10:54 -0000 1.2 *************** *** 1,3 **** *.user vc80 ! Debug \ No newline at end of file --- 1,8 ---- *.user vc80 ! Debug ! Release ! Unicode_R ! Debug CRTDLL ! Release CRTDLL ! Unicode_D |
|
From: Ferdinando A. <na...@us...> - 2006-05-30 10:03:09
|
Update of /cvsroot/objecthandler/ObjectHandler/oh In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24728/oh Modified Files: logger.cpp Log Message: auto_linking Index: logger.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/oh/logger.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** logger.cpp 29 May 2006 13:50:42 -0000 1.5 --- logger.cpp 30 May 2006 10:03:04 -0000 1.6 *************** *** 28,32 **** #ifdef BOOST_MSVC # define BOOST_LIB_DIAGNOSTIC ! # include <log4cxx/autolink.hpp> # undef BOOST_LIB_DIAGNOSTIC #endif --- 28,32 ---- #ifdef BOOST_MSVC # define BOOST_LIB_DIAGNOSTIC ! # include <log4cxx/auto_link.hpp> # undef BOOST_LIB_DIAGNOSTIC #endif |
|
From: Ferdinando A. <na...@us...> - 2006-05-30 10:02:29
|
Update of /cvsroot/objecthandler/log4cxx-0.9.7/include/log4cxx In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24322/include/log4cxx Added Files: auto_link.hpp Removed Files: autolink.hpp Log Message: auto_linking --- autolink.hpp DELETED --- --- NEW FILE: auto_link.hpp --- /* Copyright (C) 2006 Ferdinando Ametrano 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. */ #ifndef log4cxx_autolink_hpp #define log4cxx_autolink_hpp // select toolset: #if (_MSC_VER < 1200) # error "unsupported Microsoft compiler" #elif (_MSC_VER == 1200) # define LOG4CXX_LIB_TOOLSET "vc6" #elif (_MSC_VER == 1300) # define LOG4CXX_LIB_TOOLSET "vc7" #elif (_MSC_VER == 1310) # define LOG4CXX_LIB_TOOLSET "vc71" #elif (_MSC_VER == 1400) # define LOG4CXX_LIB_TOOLSET "vc80" #else # error "unknown Microsoft compiler" #endif /*** libraries to be linked ***/ // select thread opt: #ifdef _MT # define LOG4CXX_LIB_THREAD_OPT "-mt" #else # define LOG4CXX_LIB_THREAD_OPT #endif // select linkage opt: #ifdef _DLL # if defined(_DEBUG) # define LOG4CXX_LIB_RT_OPT "-gd" # else # define LOG4CXX_LIB_RT_OPT # endif #else # if defined(_DEBUG) # define LOG4CXX_LIB_RT_OPT "-sgd" # else # define LOG4CXX_LIB_RT_OPT "-s" # endif #endif #define LOG4CXX_LIB_NAME "log4cxxs-" LOG4CXX_LIB_TOOLSET LOG4CXX_LIB_THREAD_OPT LOG4CXX_LIB_RT_OPT ".lib" #pragma comment(lib, LOG4CXX_LIB_NAME) //#ifdef BOOST_LIB_DIAGNOSTIC # pragma message("Linking to lib file: " LOG4CXX_LIB_NAME) //#endif #endif |
