objecthandler-cvs Mailing List for ObjectHandler (Page 25)
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-05-24 09:42:15
|
Update of /cvsroot/objecthandler/ObjectHandler/Examples/xl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2567/Examples/xl Modified Files: ExampleXllDynamic1_vc8.vcproj ExampleXllDynamic2_vc8.vcproj ExampleXllStatic_vc8.vcproj Log Message: output folder reorganization Index: ExampleXllDynamic2_vc8.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/ExampleXllDynamic2_vc8.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExampleXllDynamic2_vc8.vcproj 19 May 2006 15:12:41 -0000 1.1 --- ExampleXllDynamic2_vc8.vcproj 24 May 2006 09:42:09 -0000 1.2 *************** *** 79,83 **** LinkIncremental="2" SuppressStartupBanner="true" ! AdditionalLibraryDirectories="..\..\xlsdk\lib,..\..\ohxl\ohxll\xll" GenerateDebugInformation="true" ProgramDatabaseFile=".\build\vc80\DebugCRTDLL/ExampleXLLDynamic2-vc80-mt-gd-0_1_4.pdb" --- 79,83 ---- LinkIncremental="2" SuppressStartupBanner="true" ! AdditionalLibraryDirectories="..\..\lib" GenerateDebugInformation="true" ProgramDatabaseFile=".\build\vc80\DebugCRTDLL/ExampleXLLDynamic2-vc80-mt-gd-0_1_4.pdb" *************** *** 177,181 **** LinkIncremental="1" SuppressStartupBanner="true" ! AdditionalLibraryDirectories="..\..\xlsdk\lib,..\..\ohxl\ohxll\xll" ProgramDatabaseFile=".\build\vc80\ReleaseCRTDLL/ExampleXLLDynamic2-vc80-mt-0_1_4.pdb" ImportLibrary=".\build\vc80\ReleaseCRTDLL/ExampleXLLDynamic2-vc80-mt-0_1_4.lib" --- 177,181 ---- LinkIncremental="1" SuppressStartupBanner="true" ! AdditionalLibraryDirectories="..\..\lib" ProgramDatabaseFile=".\build\vc80\ReleaseCRTDLL/ExampleXLLDynamic2-vc80-mt-0_1_4.pdb" ImportLibrary=".\build\vc80\ReleaseCRTDLL/ExampleXLLDynamic2-vc80-mt-0_1_4.lib" *************** *** 214,226 **** <Files> <File ! RelativePath="addindynamic2.cpp" > </File> <File ! RelativePath="account.cpp" > </File> <File ! RelativePath="account.hpp" > </File> --- 214,226 ---- <Files> <File ! RelativePath="account.cpp" > </File> <File ! RelativePath="account.hpp" > </File> <File ! RelativePath="addindynamic2.cpp" > </File> Index: ExampleXllDynamic1_vc8.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/ExampleXllDynamic1_vc8.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExampleXllDynamic1_vc8.vcproj 19 May 2006 15:12:41 -0000 1.1 --- ExampleXllDynamic1_vc8.vcproj 24 May 2006 09:42:09 -0000 1.2 *************** *** 79,83 **** LinkIncremental="1" SuppressStartupBanner="true" ! AdditionalLibraryDirectories="..\..\xlsdk\lib,..\..\ohxl\ohxll\xll" ProgramDatabaseFile=".\build\vc80\ReleaseCRTDLL/ExampleXLLDynamic1-vc80-mt-0_1_4.pdb" ImportLibrary=".\build\vc80\ReleaseCRTDLL/ExampleXLLDynamic1-vc80-mt-0_1_4.lib" --- 79,83 ---- LinkIncremental="1" SuppressStartupBanner="true" ! AdditionalLibraryDirectories="..\..\lib" ProgramDatabaseFile=".\build\vc80\ReleaseCRTDLL/ExampleXLLDynamic1-vc80-mt-0_1_4.pdb" ImportLibrary=".\build\vc80\ReleaseCRTDLL/ExampleXLLDynamic1-vc80-mt-0_1_4.lib" *************** *** 176,180 **** LinkIncremental="2" SuppressStartupBanner="true" ! AdditionalLibraryDirectories="..\..\xlsdk\lib,..\..\ohxl\ohxll\xll" GenerateDebugInformation="true" ProgramDatabaseFile=".\build\vc80\DebugCRTDLL/ExampleXLLDynamic1-vc80-mt-gd-0_1_4.pdb" --- 176,180 ---- LinkIncremental="2" SuppressStartupBanner="true" ! AdditionalLibraryDirectories="..\..\lib" GenerateDebugInformation="true" ProgramDatabaseFile=".\build\vc80\DebugCRTDLL/ExampleXLLDynamic1-vc80-mt-gd-0_1_4.pdb" *************** *** 214,226 **** <Files> <File ! RelativePath="addindynamic1.cpp" > </File> <File ! RelativePath="account.cpp" > </File> <File ! RelativePath="account.hpp" > </File> --- 214,226 ---- <Files> <File ! RelativePath="account.cpp" > </File> <File ! RelativePath="account.hpp" > </File> <File ! RelativePath="addindynamic1.cpp" > </File> Index: ExampleXllStatic_vc8.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/ExampleXllStatic_vc8.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExampleXllStatic_vc8.vcproj 19 May 2006 15:12:41 -0000 1.1 --- ExampleXllStatic_vc8.vcproj 24 May 2006 09:42:09 -0000 1.2 *************** *** 79,83 **** LinkIncremental="2" SuppressStartupBanner="true" ! AdditionalLibraryDirectories="..\..\xlsdk\lib,..\..\ohxl\ohxllib\lib,$(LOG4CXX_DIR)/msvc/lib" GenerateDebugInformation="true" ProgramDatabaseFile=".\build\vc80\Debug/ExampleXLLStatic-vc80-mt-sgd-0_1_4.pdb" --- 79,83 ---- LinkIncremental="2" SuppressStartupBanner="true" ! AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)/msvc/lib" GenerateDebugInformation="true" ProgramDatabaseFile=".\build\vc80\Debug/ExampleXLLStatic-vc80-mt-sgd-0_1_4.pdb" *************** *** 177,181 **** LinkIncremental="1" SuppressStartupBanner="true" ! AdditionalLibraryDirectories="..\..\xlsdk\lib,..\..\ohxl\ohxllib\lib,$(LOG4CXX_DIR)/msvc/lib" ProgramDatabaseFile=".\build\vc80\Release/ExampleXLLStatic-vc80-mt-s-0_1_4.pdb" ImportLibrary=".\build\vc80\Release/ExampleXLLStatic-vc80-mt-s-0_1_4.lib" --- 177,181 ---- LinkIncremental="1" SuppressStartupBanner="true" ! AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)/msvc/lib" ProgramDatabaseFile=".\build\vc80\Release/ExampleXLLStatic-vc80-mt-s-0_1_4.pdb" ImportLibrary=".\build\vc80\Release/ExampleXLLStatic-vc80-mt-s-0_1_4.lib" *************** *** 274,278 **** LinkIncremental="1" SuppressStartupBanner="true" ! AdditionalLibraryDirectories="..\..\xlsdk\lib,..\..\ohxl\ohxllib\lib,$(LOG4CXX_DIR)/msvc/lib" ProgramDatabaseFile=".\build\vc80\ReleaseCRTDLL/ExampleXLLStatic-vc80-mt-0_1_4.pdb" ImportLibrary=".\build\vc80\ReleaseCRTDLL/ExampleXLLStatic-vc80-mt-0_1_4.lib" --- 274,278 ---- LinkIncremental="1" SuppressStartupBanner="true" ! AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)/msvc/lib" ProgramDatabaseFile=".\build\vc80\ReleaseCRTDLL/ExampleXLLStatic-vc80-mt-0_1_4.pdb" ImportLibrary=".\build\vc80\ReleaseCRTDLL/ExampleXLLStatic-vc80-mt-0_1_4.lib" *************** *** 371,375 **** LinkIncremental="2" SuppressStartupBanner="true" ! AdditionalLibraryDirectories="..\..\xlsdk\lib,..\..\ohxl\ohxllib\lib,$(LOG4CXX_DIR)/msvc/lib" GenerateDebugInformation="true" ProgramDatabaseFile=".\build\vc80\DebugCRTDLL/ExampleXLLStatic-vc80-mt-gd-0_1_4.pdb" --- 371,375 ---- LinkIncremental="2" SuppressStartupBanner="true" ! AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)/msvc/lib" GenerateDebugInformation="true" ProgramDatabaseFile=".\build\vc80\DebugCRTDLL/ExampleXLLStatic-vc80-mt-gd-0_1_4.pdb" *************** *** 409,421 **** <Files> <File ! RelativePath="addinstatic.cpp" > </File> <File ! RelativePath="account.cpp" > </File> <File ! RelativePath="account.hpp" > </File> --- 409,421 ---- <Files> <File ! RelativePath="account.cpp" > </File> <File ! RelativePath="account.hpp" > </File> <File ! RelativePath="addinstatic.cpp" > </File> |
|
From: Ferdinando A. <na...@us...> - 2006-05-24 09:42:15
|
Update of /cvsroot/objecthandler/ObjectHandler/ohxl/ohxllib In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2567/ohxl/ohxllib Modified Files: ohxllib_vc8.vcproj Log Message: output folder reorganization Index: ohxllib_vc8.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/ohxllib/ohxllib_vc8.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ohxllib_vc8.vcproj 19 May 2006 15:12:41 -0000 1.1 --- ohxllib_vc8.vcproj 24 May 2006 09:42:09 -0000 1.2 *************** *** 16,21 **** <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory=".\build\vc80\DebugCRTDLL" ! IntermediateDirectory=".\build\vc80\DebugCRTDLL" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" --- 16,21 ---- <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory="..\..\build\vc80\ohxllib\DebugCRTDLL" ! IntermediateDirectory="..\..\build\vc80\ohxllib\DebugCRTDLL" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" *************** *** 48,55 **** RuntimeLibrary="3" RuntimeTypeInfo="true" ! PrecompiledHeaderFile=".\build\vc80\DebugCRTDLL/ohxllib.pch" ! AssemblerListingLocation=".\build\vc80\DebugCRTDLL/" ! ObjectFile=".\build\vc80\DebugCRTDLL/" ! ProgramDataBaseFileName=".\build\vc80\DebugCRTDLL/" WarningLevel="3" SuppressStartupBanner="true" --- 48,55 ---- RuntimeLibrary="3" RuntimeTypeInfo="true" ! PrecompiledHeaderFile="..\..\build\vc80\ohxllib\DebugCRTDLL/ohxllib.pch" ! AssemblerListingLocation="..\..\build\vc80\ohxllib\DebugCRTDLL/" ! ObjectFile="..\..\build\vc80\ohxllib\DebugCRTDLL/" ! ProgramDataBaseFileName="..\..\build\vc80\ohxllib\DebugCRTDLL/" WarningLevel="3" SuppressStartupBanner="true" *************** *** 69,73 **** <Tool Name="VCLibrarianTool" ! OutputFile="lib\ObjectHandler-vc80-mt-gd-0_1_4.lib" SuppressStartupBanner="true" /> --- 69,73 ---- <Tool Name="VCLibrarianTool" ! OutputFile="..\..\lib\ObjectHandler-xllib-vc80-mt-gd-0_1_4.lib" SuppressStartupBanner="true" /> *************** *** 81,85 **** Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile=".\build\vc80\DebugCRTDLL/ohxllib.bsc" /> <Tool --- 81,85 ---- Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile="..\..\build\vc80\ohxllib\DebugCRTDLL/ohxllib.bsc" /> <Tool *************** *** 92,97 **** <Configuration Name="Release|Win32" ! OutputDirectory=".\build\vc80\Release" ! IntermediateDirectory=".\build\vc80\Release" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" --- 92,97 ---- <Configuration Name="Release|Win32" ! OutputDirectory="..\..\build\vc80\ohxllib\Release" ! IntermediateDirectory="..\..\build\vc80\ohxllib\Release" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" *************** *** 125,132 **** EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" ! PrecompiledHeaderFile=".\build\vc80\Release/ohxllib.pch" ! AssemblerListingLocation=".\build\vc80\Release/" ! ObjectFile=".\build\vc80\Release/" ! ProgramDataBaseFileName=".\build\vc80\Release/" WarningLevel="3" SuppressStartupBanner="true" --- 125,132 ---- EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" ! PrecompiledHeaderFile="..\..\build\vc80\ohxllib\Release/ohxllib.pch" ! AssemblerListingLocation="..\..\build\vc80\ohxllib\Release/" ! ObjectFile="..\..\build\vc80\ohxllib\Release/" ! ProgramDataBaseFileName="..\..\build\vc80\ohxllib\Release/" WarningLevel="3" SuppressStartupBanner="true" *************** *** 145,149 **** <Tool Name="VCLibrarianTool" ! OutputFile="lib\ObjectHandler-vc80-mt-s-0_1_4.lib" SuppressStartupBanner="true" /> --- 145,149 ---- <Tool Name="VCLibrarianTool" ! OutputFile="..\..\lib\ObjectHandler-xllib-vc80-mt-s-0_1_4.lib" SuppressStartupBanner="true" /> *************** *** 157,161 **** Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile=".\build\vc80\Release/ohxllib.bsc" /> <Tool --- 157,161 ---- Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile="..\..\build\vc80\ohxllib\Release/ohxllib.bsc" /> <Tool *************** *** 168,173 **** <Configuration Name="Release CRTDLL|Win32" ! OutputDirectory=".\build\vc80\ReleaseCRTDLL" ! IntermediateDirectory=".\build\vc80\ReleaseCRTDLL" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" --- 168,173 ---- <Configuration Name="Release CRTDLL|Win32" ! OutputDirectory="..\..\build\vc80\ohxllib\ReleaseCRTDLL" ! IntermediateDirectory="..\..\build\vc80\ohxllib\ReleaseCRTDLL" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" *************** *** 201,208 **** EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" ! PrecompiledHeaderFile=".\build\vc80\ReleaseCRTDLL/ohxllib.pch" ! AssemblerListingLocation=".\build\vc80\ReleaseCRTDLL/" ! ObjectFile=".\build\vc80\ReleaseCRTDLL/" ! ProgramDataBaseFileName=".\build\vc80\ReleaseCRTDLL/" WarningLevel="3" SuppressStartupBanner="true" --- 201,208 ---- EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" ! PrecompiledHeaderFile="..\..\build\vc80\ohxllib\ReleaseCRTDLL/ohxllib.pch" ! AssemblerListingLocation="..\..\build\vc80\ohxllib\ReleaseCRTDLL/" ! ObjectFile="..\..\build\vc80\ohxllib\ReleaseCRTDLL/" ! ProgramDataBaseFileName="..\..\build\vc80\ohxllib\ReleaseCRTDLL/" WarningLevel="3" SuppressStartupBanner="true" *************** *** 221,225 **** <Tool Name="VCLibrarianTool" ! OutputFile="lib\ObjectHandler-vc80-mt-0_1_4.lib" SuppressStartupBanner="true" /> --- 221,225 ---- <Tool Name="VCLibrarianTool" ! OutputFile="..\..\lib\ObjectHandler-xllib-vc80-mt-0_1_4.lib" SuppressStartupBanner="true" /> *************** *** 233,237 **** Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile=".\build\vc80\ReleaseCRTDLL/ohxllib.bsc" /> <Tool --- 233,237 ---- Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile="..\..\build\vc80\ohxllib\ReleaseCRTDLL/ohxllib.bsc" /> <Tool *************** *** 244,249 **** <Configuration Name="Debug|Win32" ! OutputDirectory=".\build\vc80\Debug" ! IntermediateDirectory=".\build\vc80\Debug" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" --- 244,249 ---- <Configuration Name="Debug|Win32" ! OutputDirectory="..\..\build\vc80\ohxllib\Debug" ! IntermediateDirectory="..\..\build\vc80\ohxllib\Debug" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" *************** *** 276,283 **** RuntimeLibrary="1" RuntimeTypeInfo="true" ! PrecompiledHeaderFile=".\build\vc80\Debug/ohxllib.pch" ! AssemblerListingLocation=".\build\vc80\Debug/" ! ObjectFile=".\build\vc80\Debug/" ! ProgramDataBaseFileName=".\build\vc80\Debug/" WarningLevel="3" SuppressStartupBanner="true" --- 276,283 ---- RuntimeLibrary="1" RuntimeTypeInfo="true" ! PrecompiledHeaderFile="..\..\build\vc80\ohxllib\Debug/ohxllib.pch" ! AssemblerListingLocation="..\..\build\vc80\ohxllib\Debug/" ! ObjectFile="..\..\build\vc80\ohxllib\Debug/" ! ProgramDataBaseFileName="..\..\build\vc80\ohxllib\Debug/" WarningLevel="3" SuppressStartupBanner="true" *************** *** 297,301 **** <Tool Name="VCLibrarianTool" ! OutputFile="lib\ObjectHandler-vc80-mt-sgd-0_1_4.lib" SuppressStartupBanner="true" /> --- 297,301 ---- <Tool Name="VCLibrarianTool" ! OutputFile="..\..\lib\ObjectHandler-xllib-vc80-mt-sgd-0_1_4.lib" SuppressStartupBanner="true" /> *************** *** 309,313 **** Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile=".\build\vc80\Debug/ohxllib.bsc" /> <Tool --- 309,313 ---- Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile="..\..\build\vc80\ohxllib\Debug/ohxllib.bsc" /> <Tool |
|
From: Ferdinando A. <na...@us...> - 2006-05-24 09:42:15
|
Update of /cvsroot/objecthandler/ObjectHandler/xlsdk In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2567/xlsdk Modified Files: .cvsignore xlsdk_vc8.vcproj Log Message: output folder reorganization Index: .cvsignore =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/xlsdk/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 19 May 2006 15:12:41 -0000 1.1 --- .cvsignore 24 May 2006 09:42:09 -0000 1.2 *************** *** 1,6 **** - lib - build *.user - Makefile - Makefile.in - xlsdk.plg --- 1 ---- Index: xlsdk_vc8.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/xlsdk/xlsdk_vc8.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** xlsdk_vc8.vcproj 19 May 2006 15:12:41 -0000 1.1 --- xlsdk_vc8.vcproj 24 May 2006 09:42:09 -0000 1.2 *************** *** 16,21 **** <Configuration Name="Release|Win32" ! OutputDirectory=".\build\vc80\Release" ! IntermediateDirectory=".\build\vc80\Release" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" --- 16,21 ---- <Configuration Name="Release|Win32" ! OutputDirectory="..\build\vc80\xlsdk\Release" ! IntermediateDirectory="..\build\vc80\xlsdk\Release" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" *************** *** 49,56 **** EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" ! PrecompiledHeaderFile=".\build\vc80\Release/xlsdk.pch" ! AssemblerListingLocation=".\build\vc80\Release/" ! ObjectFile=".\build\vc80\Release/" ! ProgramDataBaseFileName=".\build\vc80\Release/" WarningLevel="3" SuppressStartupBanner="true" --- 49,56 ---- EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" ! PrecompiledHeaderFile="..\build\vc80\xlsdk\Release/xlsdk.pch" ! AssemblerListingLocation="..\build\vc80\xlsdk\Release/" ! ObjectFile="..\build\vc80\xlsdk\Release/" ! ProgramDataBaseFileName="..\build\vc80\xlsdk\Release/" WarningLevel="3" SuppressStartupBanner="true" *************** *** 69,73 **** <Tool Name="VCLibrarianTool" ! OutputFile="lib\xlsdk-vc80-mt-s.lib" SuppressStartupBanner="true" /> --- 69,73 ---- <Tool Name="VCLibrarianTool" ! OutputFile="..\lib\xlsdk-vc80-mt-s.lib" SuppressStartupBanner="true" /> *************** *** 81,85 **** Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile=".\build\vc80\Release/xlsdk.bsc" /> <Tool --- 81,85 ---- Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile="..\build\vc80\xlsdk\Release/xlsdk.bsc" /> <Tool *************** *** 92,97 **** <Configuration Name="Debug|Win32" ! OutputDirectory=".\build\vc80\Debug" ! IntermediateDirectory=".\build\vc80\Debug" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" --- 92,97 ---- <Configuration Name="Debug|Win32" ! OutputDirectory="..\build\vc80\xlsdk\Debug" ! IntermediateDirectory="..\build\vc80\xlsdk\Debug" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" *************** *** 124,131 **** RuntimeLibrary="1" RuntimeTypeInfo="true" ! PrecompiledHeaderFile=".\build\vc80\Debug/xlsdk.pch" ! AssemblerListingLocation=".\build\vc80\Debug/" ! ObjectFile=".\build\vc80\Debug/" ! ProgramDataBaseFileName=".\build\vc80\Debug/" WarningLevel="3" SuppressStartupBanner="true" --- 124,131 ---- RuntimeLibrary="1" RuntimeTypeInfo="true" ! PrecompiledHeaderFile="..\build\vc80\xlsdk\Debug/xlsdk.pch" ! AssemblerListingLocation="..\build\vc80\xlsdk\Debug/" ! ObjectFile="..\build\vc80\xlsdk\Debug/" ! ProgramDataBaseFileName="..\build\vc80\xlsdk\Debug/" WarningLevel="3" SuppressStartupBanner="true" *************** *** 145,149 **** <Tool Name="VCLibrarianTool" ! OutputFile="lib\xlsdk-vc80-mt-sgd.lib" SuppressStartupBanner="true" /> --- 145,149 ---- <Tool Name="VCLibrarianTool" ! OutputFile="..\lib\xlsdk-vc80-mt-sgd.lib" SuppressStartupBanner="true" /> *************** *** 157,161 **** Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile=".\build\vc80\Debug/xlsdk.bsc" /> <Tool --- 157,161 ---- Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile="..\build\vc80\xlsdk\Debug/xlsdk.bsc" /> <Tool *************** *** 168,173 **** <Configuration Name="Release CRTDLL|Win32" ! OutputDirectory=".\build\vc80\ReleaseCRTDLL" ! IntermediateDirectory=".\build\vc80\ReleaseCRTDLL" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" --- 168,173 ---- <Configuration Name="Release CRTDLL|Win32" ! OutputDirectory="..\build\vc80\xlsdk\ReleaseCRTDLL" ! IntermediateDirectory="..\build\vc80\xlsdk\ReleaseCRTDLL" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" *************** *** 201,208 **** EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" ! PrecompiledHeaderFile=".\build\vc80\ReleaseCRTDLL/xlsdk.pch" ! AssemblerListingLocation=".\build\vc80\ReleaseCRTDLL/" ! ObjectFile=".\build\vc80\ReleaseCRTDLL/" ! ProgramDataBaseFileName=".\build\vc80\ReleaseCRTDLL/" WarningLevel="3" SuppressStartupBanner="true" --- 201,208 ---- EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" ! PrecompiledHeaderFile="..\build\vc80\xlsdk\ReleaseCRTDLL/xlsdk.pch" ! AssemblerListingLocation="..\build\vc80\xlsdk\ReleaseCRTDLL/" ! ObjectFile="..\build\vc80\xlsdk\ReleaseCRTDLL/" ! ProgramDataBaseFileName="..\build\vc80\xlsdk\ReleaseCRTDLL/" WarningLevel="3" SuppressStartupBanner="true" *************** *** 221,225 **** <Tool Name="VCLibrarianTool" ! OutputFile="lib\xlsdk-vc80-mt.lib" SuppressStartupBanner="true" /> --- 221,225 ---- <Tool Name="VCLibrarianTool" ! OutputFile="..\lib\xlsdk-vc80-mt.lib" SuppressStartupBanner="true" /> *************** *** 233,237 **** Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile=".\build\vc80\ReleaseCRTDLL/xlsdk.bsc" /> <Tool --- 233,237 ---- Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile="..\build\vc80\xlsdk\ReleaseCRTDLL/xlsdk.bsc" /> <Tool *************** *** 244,249 **** <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory=".\build\vc80\DebugCRTDLL" ! IntermediateDirectory=".\build\vc80\DebugCRTDLL" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" --- 244,249 ---- <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory="..\build\vc80\xlsdk\DebugCRTDLL" ! IntermediateDirectory="..\build\vc80\xlsdk\DebugCRTDLL" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" *************** *** 276,283 **** RuntimeLibrary="3" RuntimeTypeInfo="true" ! PrecompiledHeaderFile=".\build\vc80\DebugCRTDLL/xlsdk.pch" ! AssemblerListingLocation=".\build\vc80\DebugCRTDLL/" ! ObjectFile=".\build\vc80\DebugCRTDLL/" ! ProgramDataBaseFileName=".\build\vc80\DebugCRTDLL/" WarningLevel="3" SuppressStartupBanner="true" --- 276,283 ---- RuntimeLibrary="3" RuntimeTypeInfo="true" ! PrecompiledHeaderFile="..\build\vc80\xlsdk\DebugCRTDLL/xlsdk.pch" ! AssemblerListingLocation="..\build\vc80\xlsdk\DebugCRTDLL/" ! ObjectFile="..\build\vc80\xlsdk\DebugCRTDLL/" ! ProgramDataBaseFileName="..\build\vc80\xlsdk\DebugCRTDLL/" WarningLevel="3" SuppressStartupBanner="true" *************** *** 297,301 **** <Tool Name="VCLibrarianTool" ! OutputFile="lib\xlsdk-vc80-mt-gd.lib" SuppressStartupBanner="true" /> --- 297,301 ---- <Tool Name="VCLibrarianTool" ! OutputFile="..\lib\xlsdk-vc80-mt-gd.lib" SuppressStartupBanner="true" /> *************** *** 309,313 **** Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile=".\build\vc80\DebugCRTDLL/xlsdk.bsc" /> <Tool --- 309,313 ---- Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile="..\build\vc80\xlsdk\DebugCRTDLL/xlsdk.bsc" /> <Tool |
|
From: Ferdinando A. <na...@us...> - 2006-05-23 12:08:53
|
Update of /cvsroot/objecthandler/ObjectHandler/ohxl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25818/ohxl Modified Files: conversions.hpp Log Message: assorted fixes Index: conversions.hpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/conversions.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** conversions.hpp 19 May 2006 15:12:41 -0000 1.1 --- conversions.hpp 23 May 2006 12:08:48 -0000 1.2 *************** *** 91,115 **** template < class T > ! void fpToVector(std::vector < T > &ret, const FP *fpVector) { ! for (int i=0; i<fpVector->rows * fpVector->columns; i++) ! ret.push_back(fpVector->array[i]); } template < class T > ! void operToVector(std::vector < T > &ret, const OPER *xVector) { OPER xTemp; bool needToFree = false; try { ! if (xVector->xltype & xltypeErr) throw Exception("input value is #NULL (xltypeErr)"); ! if (xVector->xltype & (xltypeMissing | xltypeNil)) ! return; const OPER *xMulti; ! if (xVector->xltype == xltypeMulti) ! xMulti = xVector; else { ! Excel(xlCoerce, &xTemp, 2, xVector, TempInt(xltypeMulti)); xMulti = &xTemp; needToFree = true; --- 91,118 ---- template < class T > ! std::vector < T > fpToVector(const FP &fpVector) { ! std::vector < T > ret; ! for (int i=0; i<fpVector.rows * fpVector.columns; i++) ! ret.push_back(fpVector.array[i]); ! return ret; } template < class T > ! std::vector < T > operToVector(const OPER &xVector) { OPER xTemp; bool needToFree = false; try { ! std::vector < T > ret; ! if (xVector.xltype & xltypeErr) throw Exception("input value is #NULL (xltypeErr)"); ! if (xVector.xltype & (xltypeMissing | xltypeNil)) ! return ret; const OPER *xMulti; ! if (xVector.xltype == xltypeMulti) ! xMulti = &xVector; else { ! Excel(xlCoerce, &xTemp, 2, &xVector, TempInt(xltypeMulti)); xMulti = &xTemp; needToFree = true; *************** *** 125,128 **** --- 128,132 ---- Excel(xlFree, 0, 1, &xTemp); + return ret; } catch (const std::exception &e) { if (needToFree) *************** *** 135,167 **** template < class T > ! void fpToMatrix( ! std::vector < std::vector < T > > &ret, ! const FP *fpMatrix) { ! for (int i=0; i<fpMatrix->rows; i++) { std::vector < T > row; ! for (int j=0; j<fpMatrix->columns; j++) ! row.push_back(fpMatrix->array[i * fpMatrix->columns + j]); ret.push_back(row); } } template < class T > ! void operToMatrix( ! std::vector < std::vector < T > > &ret, ! const OPER *xMatrix) { OPER xTemp; bool needToFree = false; try { ! if (xMatrix->xltype & xltypeErr) throw Exception("input value is #NULL (xltypeErr)"); ! if (xMatrix->xltype & (xltypeMissing | xltypeNil)) ! return; const OPER *xMulti; ! if (xMatrix->xltype == xltypeMulti) ! xMulti = xMatrix; else { ! Excel(xlCoerce, &xTemp, 2, xMatrix, TempInt(xltypeMulti)); xMulti = &xTemp; needToFree = true; --- 139,170 ---- template < class T > ! std::vector < std::vector < T > > fpToMatrix(const FP &fpMatrix) { ! std::vector < std::vector < T > > ret; ! for (int i=0; i<fpMatrix.rows; i++) { std::vector < T > row; ! for (int j=0; j<fpMatrix.columns; j++) ! row.push_back(fpMatrix.array[i * fpMatrix.columns + j]); ret.push_back(row); } + return ret; } template < class T > ! std::vector < std::vector < T > > operToMatrix(const OPER &xMatrix) { OPER xTemp; bool needToFree = false; try { ! std::vector < std::vector < T > > ret, ! if (xMatrix.xltype & xltypeErr) throw Exception("input value is #NULL (xltypeErr)"); ! if (xMatrix.xltype & (xltypeMissing | xltypeNil)) ! return ret; const OPER *xMulti; ! if (xMatrix.xltype == xltypeMulti) ! xMulti = &xMatrix; else { ! Excel(xlCoerce, &xTemp, 2, &xMatrix, TempInt(xltypeMulti)); xMulti = &xTemp; needToFree = true; *************** *** 181,184 **** --- 184,188 ---- Excel(xlFree, 0, 1, &xTemp); + return ret; } catch (const std::exception &e) { if (needToFree) *************** *** 190,194 **** --- 194,307 ---- } + // convert excel datatypes to datatypes of underlying library + + template < typename T > + T operToScalarLibrary(const long &arg) { + if (arg) + return T(arg); + else + return T(); + } + + template < class T > + T operToScalarLibrary(const OPER &xArg, const long &defaultValue=0) { + long arg; + operToScalar(arg, xArg, defaultValue); + return operToScalarLibrary<T>(arg); + } + + template < class T > + std::vector < T > operToVectorLibrary(const OPER &xVector) { + OPER xTemp; + bool needToFree = false; + try { + std::vector < T > ret; + if (xVector.xltype & xltypeErr) + throw Exception("input value is #NULL (xltypeErr)"); + if (xVector.xltype & (xltypeMissing | xltypeNil)) + return ret; + + const OPER *xMulti; + + if (xVector.xltype == xltypeMulti) + xMulti = &xVector; + else { + Excel(xlCoerce, &xTemp, 2, &xVector, TempInt(xltypeMulti)); + xMulti = &xTemp; + needToFree = true; + } + + for (int i=0; i<xMulti->val.array.rows * xMulti->val.array.columns; i++) + ret.push_back(operToScalarLibrary<T>(xMulti->val.array.lparray[i])); + + if (needToFree) + Excel(xlFree, 0, 1, &xTemp); + + return ret; + } catch (const std::exception &e) { + if (needToFree) + Excel(xlFree, 0, 1, &xTemp); + std::ostringstream msg; + msg << "operToVectorLibrary: " << e.what(); + throw Exception(msg.str().c_str()); + } + } + + template < class T > + std::vector < T > operToVectorLibrary(const FP &fpVector) { + std::vector < T > ret; + for (int i=0; i<fpVector.rows * fpVector.columns; i++) + ret.push_back(operToScalarLibrary<T>(fpVector.array[i])); + return ret; + } + + // convert excel types to enumerations + + template < typename T, typename EnumRegistry > + T operToScalarEnum(const OPER &xScalar, const std::string &defaultValue="") { + std::string id; + operToScalar(id, xScalar, defaultValue); + return EnumRegistry()(id); + } + + template < typename T, typename EnumRegistry > + std::vector < T > operToVectorEnum(const OPER &xVector) { + std::vector < T > ret; + OPER xTemp; + bool needToFree = false; + try { + if (xVector.xltype & xltypeErr) + throw Exception("input value is #NULL (xltypeErr)"); + if (xVector.xltype & (xltypeMissing | xltypeNil)) + return ret; + + const OPER *xMulti; + + if (xVector.xltype == xltypeMulti) + xMulti = &xVector; + else { + Excel(xlCoerce, &xTemp, 2, &xVector, TempInt(xltypeMulti)); + xMulti = &xTemp; + needToFree = true; + } + + for (int i=0; i<xMulti->val.array.rows * xMulti->val.array.columns; i++) + ret.push_back(operToScalarEnum<T, EnumRegistry>(xMulti->val.array.lparray[i])); + + if (needToFree) + Excel(xlFree, 0, 1, &xTemp); + + return ret; + } catch (const std::exception &e) { + if (needToFree) + Excel(xlFree, 0, 1, &xTemp); + std::ostringstream msg; + msg << "operToVector: " << e.what(); + throw Exception(msg.str().c_str()); + } + } + } #endif + |
