objecthandler-cvs Mailing List for ObjectHandler (Page 18)
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-09 19:02:13
|
Update of /cvsroot/objecthandler/log4cxx-0.9.7/msvc In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31614/msvc Modified Files: .cvsignore Log Message: VC71 catching up Index: .cvsignore =================================================================== RCS file: /cvsroot/objecthandler/log4cxx-0.9.7/msvc/.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 9 Jun 2006 19:02:09 -0000 1.2 *************** *** 1,3 **** ! log4cxx_vc8.suo lib ! log4cxx_vc8.ncb \ No newline at end of file --- 1,3 ---- ! log4cxx*.suo lib ! log4cxx*.ncb |
|
From: Ferdinando A. <na...@us...> - 2006-06-09 19:02:13
|
Update of /cvsroot/objecthandler/log4cxx-0.9.7/msvc/static In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31614/msvc/static Modified Files: .cvsignore static.vcproj Log Message: VC71 catching up Index: .cvsignore =================================================================== RCS file: /cvsroot/objecthandler/log4cxx-0.9.7/msvc/static/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** .cvsignore 30 May 2006 10:54:51 -0000 1.3 --- .cvsignore 9 Jun 2006 19:02:09 -0000 1.4 *************** *** 1,6 **** *.user ! vc80 ! Debug* ! Release* ! Unicode_R ! Unicode_D --- 1,2 ---- *.user ! build Index: static.vcproj =================================================================== RCS file: /cvsroot/objecthandler/log4cxx-0.9.7/msvc/static/static.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** static.vcproj 25 May 2006 11:41:33 -0000 1.1 --- static.vcproj 9 Jun 2006 19:02:09 -0000 1.2 *************** *** 14,19 **** <Configuration Name="Unicode Release|Win32" ! OutputDirectory=".\Unicode_R" ! IntermediateDirectory=".\Unicode_R" ConfigurationType="4" UseOfMFC="0" --- 14,19 ---- <Configuration Name="Unicode Release|Win32" ! OutputDirectory=".\build\vc71\$(ConfigurationName)" ! IntermediateDirectory=".\build\vc71\$(ConfigurationName)" ConfigurationType="4" UseOfMFC="0" *************** *** 30,37 **** EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\Unicode_R/static.pch" ! AssemblerListingLocation=".\Unicode_R/" ! ObjectFile=".\Unicode_R/" ! ProgramDataBaseFileName=".\Unicode_R/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 30,37 ---- EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\$(ConfigurationName)/static.pch" ! AssemblerListingLocation=".\build\vc71\$(ConfigurationName)/" ! ObjectFile=".\build\vc71\$(ConfigurationName)/" ! ProgramDataBaseFileName=".\build\vc71\$(ConfigurationName)/" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 67,72 **** <Configuration Name="Debug|Win32" ! OutputDirectory=".\Debug" ! IntermediateDirectory=".\Debug" ConfigurationType="4" UseOfMFC="0" --- 67,72 ---- <Configuration Name="Debug|Win32" ! OutputDirectory=".\build\vc71\$(ConfigurationName)" ! IntermediateDirectory=".\build\vc71\$(ConfigurationName)" ConfigurationType="4" UseOfMFC="0" *************** *** 81,88 **** RuntimeLibrary="1" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\vc71\Debug/static.pch" ! AssemblerListingLocation=".\vc71\Debug/" ! ObjectFile=".\vc71\Debug/" ! ProgramDataBaseFileName=".\vc71\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 81,88 ---- RuntimeLibrary="1" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\$(ConfigurationName)/static.pch" ! AssemblerListingLocation=".\build\vc71\$(ConfigurationName)/" ! ObjectFile=".\build\vc71\$(ConfigurationName)/" ! ProgramDataBaseFileName=".\build\vc71\$(ConfigurationName)/" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 118,123 **** <Configuration Name="Unicode Debug|Win32" ! OutputDirectory=".\Unicode_D" ! IntermediateDirectory=".\Unicode_D" ConfigurationType="4" UseOfMFC="0" --- 118,123 ---- <Configuration Name="Unicode Debug|Win32" ! OutputDirectory=".\build\vc71\$(ConfigurationName)" ! IntermediateDirectory=".\build\vc71\$(ConfigurationName)" ConfigurationType="4" UseOfMFC="0" *************** *** 132,139 **** RuntimeLibrary="1" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\Unicode_D/static.pch" ! AssemblerListingLocation=".\Unicode_D/" ! ObjectFile=".\Unicode_D/" ! ProgramDataBaseFileName=".\Unicode_D/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 132,139 ---- RuntimeLibrary="1" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\$(ConfigurationName)/static.pch" ! AssemblerListingLocation=".\build\vc71\$(ConfigurationName)/" ! ObjectFile=".\build\vc71\$(ConfigurationName)/" ! ProgramDataBaseFileName=".\build\vc71\$(ConfigurationName)/" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 169,174 **** <Configuration Name="Release|Win32" ! OutputDirectory=".\Release" ! IntermediateDirectory=".\Release" ConfigurationType="4" UseOfMFC="0" --- 169,174 ---- <Configuration Name="Release|Win32" ! OutputDirectory=".\build\vc71\$(ConfigurationName)" ! IntermediateDirectory=".\build\vc71\$(ConfigurationName)" ConfigurationType="4" UseOfMFC="0" *************** *** 185,192 **** EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\vc71\Release/static.pch" ! AssemblerListingLocation=".\vc71\Release/" ! ObjectFile=".\vc71\Release/" ! ProgramDataBaseFileName=".\vc71\Release/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 185,192 ---- EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\$(ConfigurationName)/static.pch" ! AssemblerListingLocation=".\build\vc71\$(ConfigurationName)/" ! ObjectFile=".\build\vc71\$(ConfigurationName)/" ! ProgramDataBaseFileName=".\build\vc71\$(ConfigurationName)/" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 222,227 **** <Configuration Name="Release CRTDLL|Win32" ! OutputDirectory="$(ConfigurationName)" ! IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" UseOfMFC="0" --- 222,227 ---- <Configuration Name="Release CRTDLL|Win32" ! OutputDirectory=".\build\vc71\$(ConfigurationName)" ! IntermediateDirectory=".\build\vc71\$(ConfigurationName)" ConfigurationType="4" UseOfMFC="0" *************** *** 238,245 **** EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\vc71\ReleaseCRTDLL/static.pch" ! AssemblerListingLocation=".\vc71\ReleaseCRTDLL/" ! ObjectFile=".\vc71\ReleaseCRTDLL/" ! ProgramDataBaseFileName=".\vc71\ReleaseCRTDLL/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 238,245 ---- EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\$(ConfigurationName)/static.pch" ! AssemblerListingLocation=".\build\vc71\$(ConfigurationName)/" ! ObjectFile=".\build\vc71\$(ConfigurationName)/" ! ProgramDataBaseFileName=".\build\vc71\$(ConfigurationName)/" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 275,280 **** <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory="$(ConfigurationName)" ! IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" UseOfMFC="0" --- 275,280 ---- <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory=".\build\vc71\$(ConfigurationName)" ! IntermediateDirectory=".\build\vc71\$(ConfigurationName)" ConfigurationType="4" UseOfMFC="0" *************** *** 289,296 **** RuntimeLibrary="3" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\vc71\DebugCRTDLL/static.pch" ! AssemblerListingLocation=".\vc71\DebugCRTDLL/" ! ObjectFile=".\vc71\DebugCRTDLL/" ! ProgramDataBaseFileName=".\vc71\DebugCRTDLL/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 289,296 ---- RuntimeLibrary="3" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\$(ConfigurationName)/static.pch" ! AssemblerListingLocation=".\build\vc71\$(ConfigurationName)/" ! ObjectFile=".\build\vc71\$(ConfigurationName)/" ! ProgramDataBaseFileName=".\build\vc71\$(ConfigurationName)/" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 326,331 **** <Configuration Name="Release Single Thread|Win32" ! OutputDirectory="$(ConfigurationName)" ! IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" UseOfMFC="0" --- 326,331 ---- <Configuration Name="Release Single Thread|Win32" ! OutputDirectory=".\build\vc71\$(ConfigurationName)" ! IntermediateDirectory=".\build\vc71\$(ConfigurationName)" ConfigurationType="4" UseOfMFC="0" *************** *** 342,349 **** EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\vc71\ReleaseST/static.pch" ! AssemblerListingLocation=".\vc71\ReleaseST/" ! ObjectFile=".\vc71\ReleaseST/" ! ProgramDataBaseFileName=".\vc71\ReleaseST/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 342,349 ---- EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\$(ConfigurationName)/static.pch" ! AssemblerListingLocation=".\build\vc71\$(ConfigurationName)/" ! ObjectFile=".\build\vc71\$(ConfigurationName)/" ! ProgramDataBaseFileName=".\build\vc71\$(ConfigurationName)/" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 379,384 **** <Configuration Name="Debug Single Thread|Win32" ! OutputDirectory="$(ConfigurationName)" ! IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" UseOfMFC="0" --- 379,384 ---- <Configuration Name="Debug Single Thread|Win32" ! OutputDirectory=".\build\vc71\$(ConfigurationName)" ! IntermediateDirectory=".\build\vc71\$(ConfigurationName)" ConfigurationType="4" UseOfMFC="0" *************** *** 393,400 **** RuntimeLibrary="5" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\vc71\DebugST/static.pch" ! AssemblerListingLocation=".\vc71\DebugST/" ! ObjectFile=".\vc71\DebugST/" ! ProgramDataBaseFileName=".\vc71\DebugST/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 393,400 ---- RuntimeLibrary="5" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\$(ConfigurationName)/static.pch" ! AssemblerListingLocation=".\build\vc71\$(ConfigurationName)/" ! ObjectFile=".\build\vc71\$(ConfigurationName)/" ! ProgramDataBaseFileName=".\build\vc71\$(ConfigurationName)/" WarningLevel="3" SuppressStartupBanner="TRUE" |
|
From: Eric E. <eri...@us...> - 2006-06-09 18:58:33
|
Update of /cvsroot/objecthandler/ObjectHandler/oh In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29781/oh Modified Files: object.hpp objecthandler.hpp objhandler.hpp objhandlerdefines.hpp utilities.cpp utilities.hpp Log Message: cleaner processing for object references Index: utilities.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/oh/utilities.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** utilities.cpp 6 Jun 2006 14:12:39 -0000 1.5 --- utilities.cpp 9 Jun 2006 18:58:27 -0000 1.6 *************** *** 22,25 **** --- 22,26 ---- #include <oh/utilities.hpp> #include <oh/logger.hpp> + #include <oh/objecthandler.hpp> #include <oh/exception.hpp> #include <sstream> *************** *** 31,53 **** } - DLL_API std::string storeObject( - const std::string &instanceName, - const obj_ptr &object) { - std::string ret = - ObjectHandler::instance().storeObject(instanceName, object); - return ret; - } - - DLL_API ObjHandler::obj_ptr retrieveObject( - const std::string &instanceName) { - return ObjectHandler::instance().retrieveObject(instanceName); - } - - #ifdef COMPILING_XLL - DLL_API void resetCaller() { - ObjectHandler::instance().resetCaller(); - } - #endif - std::string setLogFile( const std::string &logFileName, --- 32,35 ---- *************** *** 79,84 **** 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; --- 61,66 ---- void logObject(const std::string &instanceName) { std::ostringstream msg; ! boost::shared_ptr<Object> object = ! ObjectHandler::instance().retrieveObjectImpl(instanceName); if (object) { msg << "log dump of object with instance name = " << instanceName << std::endl; Index: object.hpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/oh/object.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** object.hpp 6 Jun 2006 17:43:10 -0000 1.4 --- object.hpp 9 Jun 2006 18:58:27 -0000 1.5 *************** *** 27,65 **** #include <boost/any.hpp> #include <oh/valueobject.hpp> #include <vector> - #include <stack> #include <string> #include <iostream> ! #define EXPORT_UNDERLYING_OBJECT(CLASS, POINTER) \ ! const CLASS& getObject() const { \ ! return *boost::dynamic_pointer_cast<CLASS>(POINTER); \ ! } ! ! //! 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()); \ ! } ! //! Object function getReference ! /*! 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 > \ ! ( NAME ## temp->getReference() ); namespace ObjHandler { --- 27,43 ---- #include <boost/any.hpp> #include <oh/valueobject.hpp> + #include <oh/objhandlerdefines.hpp> #include <vector> #include <string> #include <iostream> ! #define OH_GET_OBJECT( NAME, ID, OBJECT_CLASS ) \ ! boost::shared_ptr < OBJECT_CLASS > NAME = \ ! ObjHandler::ObjectHandler::instance().retrieveObject< OBJECT_CLASS >(ID); ! #define OH_GET_REFERENCE( NAME, ID, OBJECT_CLASS, LIBRARY_CLASS ) \ ! OH_GET_OBJECT(NAME ## temp, ID, OBJECT_CLASS ) \ ! const boost::shared_ptr < LIBRARY_CLASS > NAME = \ ! NAME ## temp->getLibraryObject < LIBRARY_CLASS >(); namespace ObjHandler { *************** *** 72,75 **** --- 50,54 ---- //! \name Constructors & Destructors //@{ + //! Default constructor. /*! Construct an Object. *************** *** 78,99 **** */ Object() {}; //! Default destructor. virtual ~Object() {}; //@} //! \name Object interrogation //@{ ! //! Acquire a reference to underlying Object. ! /*! Returns a reference to the client object stored in the Object. ! This is a shared pointer to void which must be recast appropriately. ! */ ! virtual boost::shared_ptr<void> getReference() const = 0; //! Retrieve vector of property names. /*! Returns empty vector if Object has no properties. */ std::vector < std::string > propertyNames() const; //! Retrieve value of given property. /*! Throws exception if Object has no property by that name. */ boost::any propertyValue(const std::string &propertyName) const; friend std::ostream &operator<<(std::ostream&, const Object &object); //@} --- 57,79 ---- */ Object() {}; + //! Default destructor. virtual ~Object() {}; + //@} + //! \name Object interrogation //@{ ! //! Retrieve vector of property names. /*! Returns empty vector if Object has no properties. */ std::vector < std::string > propertyNames() const; + //! Retrieve value of given property. /*! Throws exception if Object has no property by that name. */ boost::any propertyValue(const std::string &propertyName) const; + friend std::ostream &operator<<(std::ostream&, const Object &object); //@} *************** *** 116,121 **** } } #endif - --- 96,120 ---- } + template <class LibraryClass> + class LibraryObject : public Object { + public: + template <class LibraryDerivedClass> + const boost::shared_ptr<LibraryDerivedClass> getLibraryObject() const { + boost::shared_ptr<LibraryDerivedClass> ret = + boost::dynamic_pointer_cast<LibraryDerivedClass>(libraryObject_); + if (ret) + return ret; + else + throw Exception("unsuccessful attempt to recast pointer"); + } + template <> + const boost::shared_ptr<LibraryClass> getLibraryObject<LibraryClass>() const { + return libraryObject_; + } + protected: + boost::shared_ptr<LibraryClass> libraryObject_; + }; + } #endif Index: objhandlerdefines.hpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/oh/objhandlerdefines.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** objhandlerdefines.hpp 19 May 2006 15:12:41 -0000 1.1 --- objhandlerdefines.hpp 9 Jun 2006 18:58:27 -0000 1.2 *************** *** 26,33 **** #endif - #if (_MSC_VER == 1200) - # define OBJHANDLER_PATCH_MSVC6 - #endif - //! version string #ifdef _DEBUG --- 26,29 ---- *************** *** 63,69 **** #pragma warning(disable : 4996) #pragma warning(disable : 4244) - //#pragma warning(disable:4231) #endif #endif - --- 59,63 ---- Index: objecthandler.hpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/oh/objecthandler.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** objecthandler.hpp 6 Jun 2006 09:11:55 -0000 1.3 --- objecthandler.hpp 9 Jun 2006 18:58:27 -0000 1.4 *************** *** 1,5 **** /* ! Copyright (C) 2004, 2005 Eric Ehlers This file is part of QuantLib, a free-software/open-source library --- 1,5 ---- /* ! Copyright (C) 2004, 2005, 2006 Eric Ehlers This file is part of QuantLib, a free-software/open-source library *************** *** 17,21 **** /*! \file ! \brief ObjectHandler class */ --- 17,21 ---- /*! \file ! \brief ObjectHandlerclass */ *************** *** 23,54 **** #define oh_objecthandler_hpp ! #include <oh/singleton.hpp> ! ! #ifdef COMPILING_XLL ! ! #include <ohxl/objecthandlerxl.hpp> namespace ObjHandler { ! class ObjectHandler : public ObjectHandlerXL, ! public Singleton<ObjectHandler> { ! friend class Singleton<ObjectHandler>; public: ! virtual ~ObjectHandler() {} ! }; ! } ! #else ! #include <oh/objecthandlerbase.hpp> ! namespace ObjHandler { ! class ObjectHandler : public ObjectHandlerBase, ! public Singleton<ObjectHandler> { ! friend class Singleton<ObjectHandler>; ! public: ! virtual ~ObjectHandler() {} }; --- 23,106 ---- #define oh_objecthandler_hpp ! #include <oh/object.hpp> ! #include <oh/objhandlerdefines.hpp> ! #include <map> + //! ObjHandler + /*! name space for the Object Handler + */ namespace ObjHandler { ! //! Global Object repository. ! /*! Maintains a repository of Objects. Objects may be ! created/amended/destroyed by the client application. ! */ ! class DLL_API ObjectHandler { public: ! ObjectHandler(); ! ~ObjectHandler(); ! static ObjectHandler &instance(); ! //! \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 boost::shared_ptr < Object > &object); ! //! Retrieve Object with given instance name. ! /*! Throws exception if no Object exists with that instance name. ! */ ! virtual boost::shared_ptr < Object > retrieveObjectImpl(const std::string &instanceName) const; ! template < typename T > ! boost::shared_ptr < T > retrieveObject(const std::string &id) { ! boost::shared_ptr < Object > object = retrieveObjectImpl(id); ! boost::shared_ptr < T > ret = ! boost::dynamic_pointer_cast < T > (object); ! if (!ret) ! throw Exception("Error retrieving object with id '" + id + ! "' - unsuccessful attempt to recast pointer"); ! return ret; ! } ! template <> ! boost::shared_ptr < Object > retrieveObject<Object>( ! const std::string &id) { ! return retrieveObjectImpl(id); ! } ! //! Delete Object with given instance name. ! /*! Does nothing if no Object exists with that instance name. ! */ ! virtual void deleteObject(const std::string &instanceName); ! ! //! Delete all Objects in repository. ! /*! Does nothing if repository is already empty. ! */ ! virtual void deleteAllObjects(); ! ! //@} ! //! \name utilities ! //@{ ! //! Log dump of ObjectHandler. ! /*! Write all objects in ObjectHandler ! to output stream. ! */ ! virtual void dump(std::ostream&); ! ! //! Count of all Objects in repository. ! virtual const int objectCount(); ! ! //! List handles of all Objects in repository. ! /*! Returns empty list if repository is empty. ! */ ! virtual const std::vector < std::string > listInstanceNames( ! const std::string regex = ""); ! //@} ! protected: ! static ObjectHandler *instance_; ! void checkName(const std::string &instanceNameDerived); }; *************** *** 57,60 **** #endif - #endif - --- 109,110 ---- Index: utilities.hpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/oh/utilities.hpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** utilities.hpp 6 Jun 2006 17:43:13 -0000 1.5 --- utilities.hpp 9 Jun 2006 18:58:27 -0000 1.6 *************** *** 24,28 **** #define oh_utilities_hpp ! #include <oh/objecthandler.hpp> namespace ObjHandler { --- 24,29 ---- #define oh_utilities_hpp ! #include <oh/objhandlerdefines.hpp> ! #include <string> namespace ObjHandler { *************** *** 32,65 **** //! Retrieve ObjectHandler version string std::string version(); - - /** \name ObjectHandler wrappers - * These functions are a convenience for the ObjectHandler XLL - by wrapping calls to the ObjectHandler singleton - e.g. ObjHandler::ObjectHandler::instance().xxx() - so that the OH class doesn't need to be exported across DLL boundaries. - */ - //@{ - - //! Store given Object in repository under given instance name. - /*! Any existing Object with that instance name is deleted. - */ - DLL_API std::string storeObject( - const std::string &instanceName, - const ObjHandler::obj_ptr &object); - - //! Retrieve named Object from repository. - /*! Throws an exception if no Object exists with given instance name. - */ - DLL_API obj_ptr retrieveObject( - const std::string &instanceName); - - //! Clear the contents of the calling cell. - /*! Only required for XLLs. - */ - #ifdef COMPILING_XLL - DLL_API void resetCaller(); - #endif - - //@} /** \name Logging framework --- 33,36 ---- Index: objhandler.hpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/oh/objhandler.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** objhandler.hpp 25 May 2006 10:45:35 -0000 1.2 --- objhandler.hpp 9 Jun 2006 18:58:27 -0000 1.3 *************** *** 20,24 **** #include <oh/objhandlerdefines.hpp> ! #include <oh/utilities.hpp> #include <oh/exception.hpp> --- 20,24 ---- #include <oh/objhandlerdefines.hpp> ! #include <oh/objecthandler.hpp> #include <oh/utilities.hpp> #include <oh/exception.hpp> |
|
From: Eric E. <eri...@us...> - 2006-06-09 18:58:33
|
Update of /cvsroot/objecthandler/ObjectHandler/gensrc/metadata In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29781/gensrc/metadata Modified Files: functions.xml Log Message: cleaner processing for object references Index: functions.xml =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/gensrc/metadata/functions.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** functions.xml 6 Jun 2006 09:08:27 -0000 1.1 --- functions.xml 9 Jun 2006 18:58:27 -0000 1.2 *************** *** 23,27 **** <description>#/objects in repository</description> <!--platforms>CGO</platforms--> ! <alias>ObjHandler::ObjectHandler::instance().objectCount</alias> <functionCategory>ObjectHandler</functionCategory> <ParameterList> --- 23,27 ---- <description>#/objects in repository</description> <!--platforms>CGO</platforms--> ! <alias>ObjHandler::ObjectHandlerXL::instance().objectCount</alias> <functionCategory>ObjectHandler</functionCategory> <ParameterList> *************** *** 38,42 **** <description>list instance names of objects in repository</description> <!--platforms>CGO</platforms--> ! <alias>ObjHandler::ObjectHandler::instance().listInstanceNames</alias> <functionCategory>ObjectHandler</functionCategory> <ParameterList> --- 38,42 ---- <description>list instance names of objects in repository</description> <!--platforms>CGO</platforms--> ! <alias>ObjHandler::ObjectHandlerXL::instance().listInstanceNames</alias> <functionCategory>ObjectHandler</functionCategory> <ParameterList> *************** *** 100,104 **** <description>delete object from repository</description> <!--platforms>CGO</platforms--> ! <alias>ObjHandler::ObjectHandler::instance().deleteObject</alias> <functionCategory>ObjectHandler</functionCategory> <ParameterList> --- 100,104 ---- <description>delete object from repository</description> <!--platforms>CGO</platforms--> ! <alias>ObjHandler::ObjectHandlerXL::instance().deleteObject</alias> <functionCategory>ObjectHandler</functionCategory> <ParameterList> *************** *** 121,125 **** <description>delete all objects from repository</description> <!--platforms>CGO</platforms--> ! <alias>ObjHandler::ObjectHandler::instance().deleteAllObjects</alias> <functionCategory>ObjectHandler</functionCategory> <ParameterList> --- 121,125 ---- <description>delete all objects from repository</description> <!--platforms>CGO</platforms--> ! <alias>ObjHandler::ObjectHandlerXL::instance().deleteAllObjects</alias> <functionCategory>ObjectHandler</functionCategory> <ParameterList> *************** *** 370,374 **** <!--platforms>D</platforms--> <functionCategory>ObjectHandler</functionCategory> ! <alias>ObjHandler::ObjectHandler::instance().collectGarbage</alias> <ParameterList> <Parameters/> --- 370,374 ---- <!--platforms>D</platforms--> <functionCategory>ObjectHandler</functionCategory> ! <alias>ObjHandler::ObjectHandlerXL::instance().collectGarbage</alias> <ParameterList> <Parameters/> |
|
From: Eric E. <eri...@us...> - 2006-06-09 18:58:33
|
Update of /cvsroot/objecthandler/ObjectHandler/gensrc/stubs In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29781/gensrc/stubs Modified Files: stub.excel.includes Log Message: cleaner processing for object references Index: stub.excel.includes =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/gensrc/stubs/stub.excel.includes,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** stub.excel.includes 6 Jun 2006 09:08:30 -0000 1.1 --- stub.excel.includes 9 Jun 2006 18:58:27 -0000 1.2 *************** *** 1,7 **** --- 1,9 ---- #include <oh/utilities.hpp> #include <oh/exception.hpp> + #include <ohxl/objecthandlerxl.hpp> #include <ohxl/conversions.hpp> #include <ohxl/functioncall.hpp> #include <sstream> + #include <map> #define XLL_DEC extern "C" |
|
From: Eric E. <eri...@us...> - 2006-06-09 18:58:31
|
Update of /cvsroot/objecthandler/ObjectHandler/ohxl/ohxll In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29781/ohxl/ohxll Modified Files: addin.cpp ohxll.vcproj ohxll_vc8.vcproj Log Message: cleaner processing for object references Index: addin.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/ohxll/addin.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** addin.cpp 6 Jun 2006 09:08:27 -0000 1.4 --- addin.cpp 9 Jun 2006 18:58:27 -0000 1.5 *************** *** 17,20 **** --- 17,21 ---- #include <xlsdk/xlsdkdefines.hpp> + #include <ohxl/objecthandlerxl.hpp> #include <ohxl/register.hpp> #include <ohxl/unregister.hpp> *************** *** 23,26 **** --- 24,30 ---- #include <sstream> + // instantiate the object handler singleton + ObjHandler::ObjectHandlerXL objectHandler; + DLLEXPORT int xlAutoOpen() { static XLOPER xDll; Index: ohxll_vc8.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/ohxll/ohxll_vc8.vcproj,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ohxll_vc8.vcproj 1 Jun 2006 15:59:53 -0000 1.6 --- ohxll_vc8.vcproj 9 Jun 2006 18:58:28 -0000 1.7 *************** *** 245,257 **** </File> <File ! RelativePath="..\..\oh\objecthandler.hpp" ! > ! </File> ! <File ! RelativePath="..\..\oh\objecthandlerbase.cpp" > </File> <File ! RelativePath="..\..\oh\objecthandlerbase.hpp" > </File> --- 245,253 ---- </File> <File ! RelativePath="..\..\oh\objecthandler.cpp" > </File> <File ! RelativePath="..\..\oh\objecthandler.hpp" > </File> *************** *** 301,308 **** </File> <File - RelativePath="..\export.hpp" - > - </File> - <File RelativePath="..\functioncall.cpp" > --- 297,300 ---- *************** *** 325,328 **** --- 317,324 ---- </File> <File + RelativePath="..\objhandlerxl.hpp" + > + </File> + <File RelativePath="..\register.cpp" > Index: ohxll.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/ohxll/ohxll.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ohxll.vcproj 1 Jun 2006 15:58:30 -0000 1.2 --- ohxll.vcproj 9 Jun 2006 18:58:28 -0000 1.3 *************** *** 48,52 **** 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 --- 48,52 ---- GenerateDebugInformation="TRUE" ProgramDatabaseFile="..\..\xll\ObjectHandler-xll-vc71-mt-gd-0_1_4.pdb" ! ImportLibrary="..\..\lib\ObjectHandler-xll-vc71-mt-gd-0_1_4.lib" TargetMachine="1"/> <Tool *************** *** 115,119 **** 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 --- 115,119 ---- AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\Lib" ProgramDatabaseFile="..\..\xll\ObjectHandler-xll-vc71-mt-0_1_4.pdb" ! ImportLibrary="..\..\lib\ObjectHandler-xll-vc71-mt-0_1_4.lib" TargetMachine="1"/> <Tool *************** *** 154,158 **** Filter=""> <File ! RelativePath="..\..\oh\autolink.hpp"> </File> <File --- 154,158 ---- Filter=""> <File ! RelativePath="..\..\oh\auto_link.hpp"> </File> <File *************** *** 178,185 **** </File> <File ! RelativePath="..\..\oh\objecthandlerbase.cpp"> ! </File> ! <File ! RelativePath="..\..\oh\objecthandlerbase.hpp"> </File> <File --- 178,182 ---- </File> <File ! RelativePath="..\..\oh\objecthandler.cpp"> </File> <File |
|
From: Eric E. <eri...@us...> - 2006-06-09 18:58:31
|
Update of /cvsroot/objecthandler/ObjectHandler/ohxl/ohxllib In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29781/ohxl/ohxllib Modified Files: ohxllib.vcproj ohxllib_vc8.vcproj Log Message: cleaner processing for object references Index: ohxllib_vc8.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/ohxllib/ohxllib_vc8.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ohxllib_vc8.vcproj 1 Jun 2006 15:59:53 -0000 1.5 --- ohxllib_vc8.vcproj 9 Jun 2006 18:58:28 -0000 1.6 *************** *** 354,366 **** </File> <File ! RelativePath="..\..\oh\objecthandler.hpp" ! > ! </File> ! <File ! RelativePath="..\..\oh\objecthandlerbase.cpp" > </File> <File ! RelativePath="..\..\oh\objecthandlerbase.hpp" > </File> --- 354,362 ---- </File> <File ! RelativePath="..\..\oh\objecthandler.cpp" > </File> <File ! RelativePath="..\..\oh\objecthandler.hpp" > </File> *************** *** 434,437 **** --- 430,437 ---- </File> <File + RelativePath="..\objhandlerxl.hpp" + > + </File> + <File RelativePath="..\register.cpp" > Index: ohxllib.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/ohxllib/ohxllib.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ohxllib.vcproj 1 Jun 2006 15:58:30 -0000 1.2 --- ohxllib.vcproj 9 Jun 2006 18:58:28 -0000 1.3 *************** *** 334,338 **** Filter=""> <File ! RelativePath="..\..\oh\autolink.hpp"> </File> <File --- 334,338 ---- Filter=""> <File ! RelativePath="..\..\oh\auto_link.hpp"> </File> <File *************** *** 358,365 **** </File> <File ! RelativePath="..\..\oh\objecthandlerbase.cpp"> ! </File> ! <File ! RelativePath="..\..\oh\objecthandlerbase.hpp"> </File> <File --- 358,362 ---- </File> <File ! RelativePath="..\..\oh\objecthandler.cpp"> </File> <File |
|
From: Eric E. <eri...@us...> - 2006-06-09 18:58:30
|
Update of /cvsroot/objecthandler/ObjectHandler In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29781 Modified Files: ohlib.vcproj ohlib_vc8.vcproj Log Message: cleaner processing for object references Index: ohlib.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohlib.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ohlib.vcproj 1 Jun 2006 15:58:30 -0000 1.2 --- ohlib.vcproj 9 Jun 2006 18:58:27 -0000 1.3 *************** *** 331,335 **** <Files> <File ! RelativePath=".\oh\auto_link.hpp"> </File> <File --- 331,335 ---- <Files> <File ! RelativePath="oh\auto_link.hpp"> </File> <File *************** *** 352,362 **** </File> <File ! RelativePath="oh\objecthandler.hpp"> ! </File> ! <File ! RelativePath="oh\objecthandlerbase.cpp"> </File> <File ! RelativePath="oh\objecthandlerbase.hpp"> </File> <File --- 352,359 ---- </File> <File ! RelativePath="oh\objecthandler.cpp"> </File> <File ! RelativePath="oh\objecthandler.hpp"> </File> <File Index: ohlib_vc8.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohlib_vc8.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ohlib_vc8.vcproj 1 Jun 2006 15:59:53 -0000 1.3 --- ohlib_vc8.vcproj 9 Jun 2006 18:58:27 -0000 1.4 *************** *** 351,363 **** </File> <File ! RelativePath="oh\objecthandler.hpp" ! > ! </File> ! <File ! RelativePath="oh\objecthandlerbase.cpp" > </File> <File ! RelativePath="oh\objecthandlerbase.hpp" > </File> --- 351,359 ---- </File> <File ! RelativePath="oh\objecthandler.cpp" > </File> <File ! RelativePath="oh\objecthandler.hpp" > </File> |
Update of /cvsroot/objecthandler/ObjectHandler/Examples/xl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29781/Examples/xl Modified Files: .cvsignore ExampleXllDynamic1.vcproj ExampleXllDynamic1_vc8.vcproj ExampleXllDynamic2.vcproj ExampleXllDynamic2_vc8.vcproj ExampleXllStatic.vcproj ExampleXllStatic_vc8.vcproj account.cpp account.hpp addindynamic1.cpp addindynamic2.cpp addinstatic.cpp exampleDynamic.xls exampleStatic.xls Log Message: cleaner processing for object references Index: exampleStatic.xls =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/exampleStatic.xls,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsnl11Jr and /tmp/cvskKgtAe differ Index: .cvsignore =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/.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 9 Jun 2006 18:58:27 -0000 1.2 *************** *** 1,4 **** *.plg ! build xll *.vcproj.*user --- 1,4 ---- *.plg ! build* xll *.vcproj.*user Index: ExampleXllDynamic2_vc8.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/ExampleXllDynamic2_vc8.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ExampleXllDynamic2_vc8.vcproj 25 May 2006 10:19:00 -0000 1.4 --- ExampleXllDynamic2_vc8.vcproj 9 Jun 2006 18:58:27 -0000 1.5 *************** *** 16,21 **** <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory=".\build\vc80\DebugCRTDLL" ! IntermediateDirectory=".\build\vc80\DebugCRTDLL" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" --- 16,21 ---- <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory=".\buildXllDynamic2\vc80\DebugCRTDLL" ! IntermediateDirectory=".\buildXllDynamic2\vc80\DebugCRTDLL" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" *************** *** 42,46 **** SuppressStartupBanner="true" TargetEnvironment="1" ! TypeLibraryName=".\build\vc80\DebugCRTDLL/ExampleXllDynamic2.tlb" HeaderFileName="" /> --- 42,46 ---- SuppressStartupBanner="true" TargetEnvironment="1" ! TypeLibraryName=".\buildXllDynamic2\vc80\DebugCRTDLL\ExampleXllDynamic2.tlb" HeaderFileName="" /> *************** *** 54,61 **** RuntimeLibrary="3" RuntimeTypeInfo="true" ! PrecompiledHeaderFile=".\build\vc80\DebugCRTDLL/ExampleXllDynamic2.pch" ! AssemblerListingLocation=".\build\vc80\DebugCRTDLL/" ! ObjectFile=".\build\vc80\DebugCRTDLL/" ! ProgramDataBaseFileName=".\build\vc80\DebugCRTDLL/" WarningLevel="3" SuppressStartupBanner="true" --- 54,61 ---- RuntimeLibrary="3" RuntimeTypeInfo="true" ! PrecompiledHeaderFile=".\buildXllDynamic2\vc80\DebugCRTDLL\ExampleXllDynamic2.pch" ! AssemblerListingLocation=".\buildXllDynamic2\vc80\DebugCRTDLL\" ! ObjectFile=".\buildXllDynamic2\vc80\DebugCRTDLL\" ! ProgramDataBaseFileName=".\buildXllDynamic2\vc80\DebugCRTDLL\" WarningLevel="3" SuppressStartupBanner="true" *************** *** 81,86 **** AdditionalLibraryDirectories="..\..\lib,..\..\xll" GenerateDebugInformation="true" ! ProgramDatabaseFile=".\build\vc80\DebugCRTDLL/ExampleXLLDynamic2-vc80-mt-gd-0_1_4.pdb" ! ImportLibrary=".\build\vc80\DebugCRTDLL/ExampleXLLDynamic2-vc80-mt-gd-0_1_4.lib" TargetMachine="1" /> --- 81,86 ---- AdditionalLibraryDirectories="..\..\lib,..\..\xll" GenerateDebugInformation="true" ! ProgramDatabaseFile=".\buildXllDynamic2\vc80\DebugCRTDLL\ExampleXLLDynamic2-vc80-mt-gd-0_1_4.pdb" ! ImportLibrary=".\buildXllDynamic2\vc80\DebugCRTDLL\ExampleXLLDynamic2-vc80-mt-gd-0_1_4.lib" TargetMachine="1" /> *************** *** 97,101 **** Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile=".\build\vc80\DebugCRTDLL/ExampleXllDynamic2.bsc" /> <Tool --- 97,101 ---- Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile=".\buildXllDynamic2\vc80\DebugCRTDLL\ExampleXllDynamic2.bsc" /> <Tool *************** *** 114,119 **** <Configuration Name="Release CRTDLL|Win32" ! OutputDirectory=".\build\vc80\ReleaseCRTDLL" ! IntermediateDirectory=".\build\vc80\ReleaseCRTDLL" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" --- 114,119 ---- <Configuration Name="Release CRTDLL|Win32" ! OutputDirectory=".\buildXllDynamic2\vc80\ReleaseCRTDLL" ! IntermediateDirectory=".\buildXllDynamic2\vc80\ReleaseCRTDLL" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" *************** *** 140,144 **** SuppressStartupBanner="true" TargetEnvironment="1" ! TypeLibraryName=".\build\vc80\ReleaseCRTDLL/ExampleXllDynamic2.tlb" HeaderFileName="" /> --- 140,144 ---- SuppressStartupBanner="true" TargetEnvironment="1" ! TypeLibraryName=".\buildXllDynamic2\vc80\ReleaseCRTDLL\ExampleXllDynamic2.tlb" HeaderFileName="" /> *************** *** 153,160 **** EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" ! PrecompiledHeaderFile=".\build\vc80\ReleaseCRTDLL/ExampleXllDynamic2.pch" ! AssemblerListingLocation=".\build\vc80\ReleaseCRTDLL/" ! ObjectFile=".\build\vc80\ReleaseCRTDLL/" ! ProgramDataBaseFileName=".\build\vc80\ReleaseCRTDLL/" WarningLevel="3" SuppressStartupBanner="true" --- 153,160 ---- EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" ! PrecompiledHeaderFile=".\buildXllDynamic2\vc80\ReleaseCRTDLL\ExampleXllDynamic2.pch" ! AssemblerListingLocation=".\buildXllDynamic2\vc80\ReleaseCRTDLL\" ! ObjectFile=".\buildXllDynamic2\vc80\ReleaseCRTDLL\" ! ProgramDataBaseFileName=".\buildXllDynamic2\vc80\ReleaseCRTDLL\" WarningLevel="3" SuppressStartupBanner="true" *************** *** 178,183 **** SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib,..\..\xll" ! ProgramDatabaseFile=".\build\vc80\ReleaseCRTDLL/ExampleXLLDynamic2-vc80-mt-0_1_4.pdb" ! ImportLibrary=".\build\vc80\ReleaseCRTDLL/ExampleXLLDynamic2-vc80-mt-0_1_4.lib" TargetMachine="1" /> --- 178,183 ---- SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib,..\..\xll" ! ProgramDatabaseFile=".\buildXllDynamic2\vc80\ReleaseCRTDLL\ExampleXLLDynamic2-vc80-mt-0_1_4.pdb" ! ImportLibrary=".\buildXllDynamic2\vc80\ReleaseCRTDLL\ExampleXLLDynamic2-vc80-mt-0_1_4.lib" TargetMachine="1" /> *************** *** 194,198 **** Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile=".\build\vc80\ReleaseCRTDLL/ExampleXllDynamic2.bsc" /> <Tool --- 194,198 ---- Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile=".\buildXllDynamic2\vc80\ReleaseCRTDLL\ExampleXllDynamic2.bsc" /> <Tool Index: ExampleXllStatic.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/ExampleXllStatic.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ExampleXllStatic.vcproj 1 Jun 2006 15:58:30 -0000 1.2 --- ExampleXllStatic.vcproj 9 Jun 2006 18:58:27 -0000 1.3 *************** *** 13,18 **** <Configuration Name="Debug|Win32" ! OutputDirectory=".\build\vc71\Debug" ! IntermediateDirectory=".\build\vc71\Debug" ConfigurationType="2" UseOfMFC="0" --- 13,18 ---- <Configuration Name="Debug|Win32" ! OutputDirectory=".\buildXllStatic\vc71\Debug" ! IntermediateDirectory=".\buildXllStatic\vc71\Debug" ConfigurationType="2" UseOfMFC="0" *************** *** 28,35 **** RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\Debug/ExampleXllStatic.pch" ! AssemblerListingLocation=".\build\vc71\Debug/" ! ObjectFile=".\build\vc71\Debug/" ! ProgramDataBaseFileName=".\build\vc71\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 28,35 ---- RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\buildXllStatic\vc71\Debug\ExampleXllStatic.pch" ! AssemblerListingLocation=".\buildXllStatic\vc71\Debug\" ! ObjectFile=".\buildXllStatic\vc71\Debug\" ! ProgramDataBaseFileName=".\buildXllStatic\vc71\Debug\" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 46,51 **** AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\lib" GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\build\vc71\Debug/ExampleXLLStatic-vc71-mt-sgd-0_1_4.pdb" ! ImportLibrary=".\build\vc71\Debug/ExampleXLLStatic-vc71-mt-sgd-0_1_4.lib" TargetMachine="1"/> <Tool --- 46,51 ---- AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\lib" GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\buildXllStatic\vc71\Debug\ExampleXLLStatic-vc71-mt-sgd-0_1_4.pdb" ! ImportLibrary=".\buildXllStatic\vc71\Debug\ExampleXLLStatic-vc71-mt-sgd-0_1_4.lib" TargetMachine="1"/> <Tool *************** *** 55,59 **** SuppressStartupBanner="TRUE" TargetEnvironment="1" ! TypeLibraryName=".\build\vc71\Debug/ExampleXllStatic.tlb" HeaderFileName=""/> <Tool --- 55,59 ---- SuppressStartupBanner="TRUE" TargetEnvironment="1" ! TypeLibraryName=".\buildXllStatic\vc71\Debug\ExampleXllStatic.tlb" HeaderFileName=""/> <Tool *************** *** 80,85 **** <Configuration Name="Release|Win32" ! OutputDirectory=".\build\vc71\Release" ! IntermediateDirectory=".\build\vc71\Release" ConfigurationType="2" UseOfMFC="0" --- 80,85 ---- <Configuration Name="Release|Win32" ! OutputDirectory=".\buildXllStatic\vc71\Release" ! IntermediateDirectory=".\buildXllStatic\vc71\Release" ConfigurationType="2" UseOfMFC="0" *************** *** 97,104 **** RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\Release/ExampleXllStatic.pch" ! AssemblerListingLocation=".\build\vc71\Release/" ! ObjectFile=".\build\vc71\Release/" ! ProgramDataBaseFileName=".\build\vc71\Release/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 97,104 ---- RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\buildXllStatic\vc71\Release\ExampleXllStatic.pch" ! AssemblerListingLocation=".\buildXllStatic\vc71\Release\" ! ObjectFile=".\buildXllStatic\vc71\Release\" ! ProgramDataBaseFileName=".\buildXllStatic\vc71\Release\" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 113,118 **** 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" TargetMachine="1"/> <Tool --- 113,118 ---- SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\lib" ! ProgramDatabaseFile=".\buildXllStatic\vc71\Release\ExampleXLLStatic-vc71-mt-s-0_1_4.pdb" ! ImportLibrary=".\buildXllStatic\vc71\Release\ExampleXLLStatic-vc71-mt-s-0_1_4.lib" TargetMachine="1"/> <Tool *************** *** 122,126 **** SuppressStartupBanner="TRUE" TargetEnvironment="1" ! TypeLibraryName=".\build\vc71\Release/ExampleXllStatic.tlb" HeaderFileName=""/> <Tool --- 122,126 ---- SuppressStartupBanner="TRUE" TargetEnvironment="1" ! TypeLibraryName=".\buildXllStatic\vc71\Release\ExampleXllStatic.tlb" HeaderFileName=""/> <Tool *************** *** 147,152 **** <Configuration Name="Release SingleThread|Win32" ! OutputDirectory=".\build\vc71\ReleaseST" ! IntermediateDirectory=".\build\vc71\ReleaseST" ConfigurationType="2" UseOfMFC="0" --- 147,152 ---- <Configuration Name="Release SingleThread|Win32" ! OutputDirectory=".\buildXllStatic\vc71\ReleaseST" ! IntermediateDirectory=".\buildXllStatic\vc71\ReleaseST" ConfigurationType="2" UseOfMFC="0" *************** *** 164,171 **** RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\ReleaseST/ExampleXllStatic.pch" ! AssemblerListingLocation=".\build\vc71\ReleaseST/" ! ObjectFile=".\build\vc71\ReleaseST/" ! ProgramDataBaseFileName=".\build\vc71\ReleaseST/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 164,171 ---- RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\buildXllStatic\vc71\ReleaseST\ExampleXllStatic.pch" ! AssemblerListingLocation=".\buildXllStatic\vc71\ReleaseST\" ! ObjectFile=".\buildXllStatic\vc71\ReleaseST\" ! ProgramDataBaseFileName=".\buildXllStatic\vc71\ReleaseST\" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 180,185 **** 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" TargetMachine="1"/> <Tool --- 180,185 ---- SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\lib" ! ProgramDatabaseFile=".\buildXllStatic\vc71\ReleaseST\ExampleXLLStatic-vc71-s-0_1_4.pdb" ! ImportLibrary=".\buildXllStatic\vc71\ReleaseST\ExampleXLLStatic-vc71-s-0_1_4.lib" TargetMachine="1"/> <Tool *************** *** 189,193 **** SuppressStartupBanner="TRUE" TargetEnvironment="1" ! TypeLibraryName=".\build\vc71\ReleaseST/ExampleXllStatic.tlb" HeaderFileName=""/> <Tool --- 189,193 ---- SuppressStartupBanner="TRUE" TargetEnvironment="1" ! TypeLibraryName=".\buildXllStatic\vc71\ReleaseST\ExampleXllStatic.tlb" HeaderFileName=""/> <Tool *************** *** 214,219 **** <Configuration Name="Debug SingleThread|Win32" ! OutputDirectory=".\build\vc71\DebugST" ! IntermediateDirectory=".\build\vc71\DebugST" ConfigurationType="2" UseOfMFC="0" --- 214,219 ---- <Configuration Name="Debug SingleThread|Win32" ! OutputDirectory=".\buildXllStatic\vc71\DebugST" ! IntermediateDirectory=".\buildXllStatic\vc71\DebugST" ConfigurationType="2" UseOfMFC="0" *************** *** 229,236 **** RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\DebugST/ExampleXllStatic.pch" ! AssemblerListingLocation=".\build\vc71\DebugST/" ! ObjectFile=".\build\vc71\DebugST/" ! ProgramDataBaseFileName=".\build\vc71\DebugST/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 229,236 ---- RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\buildXllStatic\vc71\DebugST\ExampleXllStatic.pch" ! AssemblerListingLocation=".\buildXllStatic\vc71\DebugST\" ! ObjectFile=".\buildXllStatic\vc71\DebugST\" ! ProgramDataBaseFileName=".\buildXllStatic\vc71\DebugST\" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 247,252 **** AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\lib" GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\build\vc71\DebugST/ExampleXLLStatic-vc71-sgd-0_1_4.pdb" ! ImportLibrary=".\build\vc71\DebugST/ExampleXLLStatic-vc71-sgd-0_1_4.lib" TargetMachine="1"/> <Tool --- 247,252 ---- AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\lib" GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\buildXllStatic\vc71\DebugST\ExampleXLLStatic-vc71-sgd-0_1_4.pdb" ! ImportLibrary=".\buildXllStatic\vc71\DebugST\ExampleXLLStatic-vc71-sgd-0_1_4.lib" TargetMachine="1"/> <Tool *************** *** 256,260 **** SuppressStartupBanner="TRUE" TargetEnvironment="1" ! TypeLibraryName=".\build\vc71\DebugST/ExampleXllStatic.tlb" HeaderFileName=""/> <Tool --- 256,260 ---- SuppressStartupBanner="TRUE" TargetEnvironment="1" ! TypeLibraryName=".\buildXllStatic\vc71\DebugST\ExampleXllStatic.tlb" HeaderFileName=""/> <Tool *************** *** 281,286 **** <Configuration Name="Release CRTDLL|Win32" ! OutputDirectory=".\build\vc71\ReleaseCRTDLL" ! IntermediateDirectory=".\build\vc71\ReleaseCRTDLL" ConfigurationType="2" UseOfMFC="0" --- 281,286 ---- <Configuration Name="Release CRTDLL|Win32" ! OutputDirectory=".\buildXllStatic\vc71\ReleaseCRTDLL" ! IntermediateDirectory=".\buildXllStatic\vc71\ReleaseCRTDLL" ConfigurationType="2" UseOfMFC="0" *************** *** 298,305 **** RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\ReleaseCRTDLL/ExampleXllStatic.pch" ! AssemblerListingLocation=".\build\vc71\ReleaseCRTDLL/" ! ObjectFile=".\build\vc71\ReleaseCRTDLL/" ! ProgramDataBaseFileName=".\build\vc71\ReleaseCRTDLL/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 298,305 ---- RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\buildXllStatic\vc71\ReleaseCRTDLL\ExampleXllStatic.pch" ! AssemblerListingLocation=".\buildXllStatic\vc71\ReleaseCRTDLL\" ! ObjectFile=".\buildXllStatic\vc71\ReleaseCRTDLL\" ! ProgramDataBaseFileName=".\buildXllStatic\vc71\ReleaseCRTDLL\" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 314,319 **** 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" TargetMachine="1"/> <Tool --- 314,319 ---- SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\lib" ! ProgramDatabaseFile=".\buildXllStatic\vc71\ReleaseCRTDLL\ExampleXLLStatic-vc71-mt-0_1_4.pdb" ! ImportLibrary=".\buildXllStatic\vc71\ReleaseCRTDLL\ExampleXLLStatic-vc71-mt-0_1_4.lib" TargetMachine="1"/> <Tool *************** *** 323,327 **** SuppressStartupBanner="TRUE" TargetEnvironment="1" ! TypeLibraryName=".\build\vc71\ReleaseCRTDLL/ExampleXllStatic.tlb" HeaderFileName=""/> <Tool --- 323,327 ---- SuppressStartupBanner="TRUE" TargetEnvironment="1" ! TypeLibraryName=".\buildXllStatic\vc71\ReleaseCRTDLL\ExampleXllStatic.tlb" HeaderFileName=""/> <Tool *************** *** 348,353 **** <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory=".\build\vc71\DebugCRTDLL" ! IntermediateDirectory=".\build\vc71\DebugCRTDLL" ConfigurationType="2" UseOfMFC="0" --- 348,353 ---- <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory=".\buildXllStatic\vc71\DebugCRTDLL" ! IntermediateDirectory=".\buildXllStatic\vc71\DebugCRTDLL" ConfigurationType="2" UseOfMFC="0" *************** *** 363,370 **** RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\DebugCRTDLL/ExampleXllStatic.pch" ! AssemblerListingLocation=".\build\vc71\DebugCRTDLL/" ! ObjectFile=".\build\vc71\DebugCRTDLL/" ! ProgramDataBaseFileName=".\build\vc71\DebugCRTDLL/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 363,370 ---- RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\buildXllStatic\vc71\DebugCRTDLL\ExampleXllStatic.pch" ! AssemblerListingLocation=".\buildXllStatic\vc71\DebugCRTDLL\" ! ObjectFile=".\buildXllStatic\vc71\DebugCRTDLL\" ! ProgramDataBaseFileName=".\buildXllStatic\vc71\DebugCRTDLL\" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 381,386 **** AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\lib" GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\build\vc71\DebugCRTDLL/ExampleXLLStatic-vc71-mt-gd-0_1_4.pdb" ! ImportLibrary=".\build\vc71\DebugCRTDLL/ExampleXLLStatic-vc71-mt-gd-0_1_4.lib" TargetMachine="1"/> <Tool --- 381,386 ---- AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\lib" GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\buildXllStatic\vc71\DebugCRTDLL\ExampleXLLStatic-vc71-mt-gd-0_1_4.pdb" ! ImportLibrary=".\buildXllStatic\vc71\DebugCRTDLL\ExampleXLLStatic-vc71-mt-gd-0_1_4.lib" TargetMachine="1"/> <Tool *************** *** 390,394 **** SuppressStartupBanner="TRUE" TargetEnvironment="1" ! TypeLibraryName=".\build\vc71\DebugCRTDLL/ExampleXllStatic.tlb" HeaderFileName=""/> <Tool --- 390,394 ---- SuppressStartupBanner="TRUE" TargetEnvironment="1" ! TypeLibraryName=".\buildXllStatic\vc71\DebugCRTDLL\ExampleXllStatic.tlb" HeaderFileName=""/> <Tool Index: addindynamic2.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/addindynamic2.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** addindynamic2.cpp 6 Jun 2006 09:08:26 -0000 1.5 --- addindynamic2.cpp 9 Jun 2006 18:58:27 -0000 1.6 *************** *** 16,24 **** */ - #include <oh/objhandler.hpp> #include <account.hpp> ! #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 --- 16,21 ---- */ #include <account.hpp> ! #include <ohxl/objhandlerxl.hpp> /* Use BOOST_MSVC instead of _MSC_VER since some other vendors (Metrowerks, for example) also #define _MSC_VER *************** *** 64,68 **** --- 61,67 ---- functionCall = boost::shared_ptr < ObjHandler::FunctionCall > ( new ObjHandler::FunctionCall("addin2GetBalance") ); + OH_GET_OBJECT(accountObject, instanceName, AccountObject) + static long ret; ret = accountObject->getBalance(); Index: account.hpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/account.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** account.hpp 19 May 2006 15:12:41 -0000 1.1 --- account.hpp 9 Jun 2006 18:58:27 -0000 1.2 *************** *** 40,44 **** }; ! class AccountObject : public ObjHandler::Object { public: AccountObject( --- 40,44 ---- }; ! class AccountObject : public ObjHandler::LibraryObject<Account> { public: AccountObject( *************** *** 47,53 **** void setBalance(const int &balance); const int &getBalance(); - virtual boost::shared_ptr<void> getReference() const; - private: - boost::shared_ptr<Account> account_; }; --- 47,50 ---- Index: account.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/account.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** account.cpp 24 May 2006 14:22:07 -0000 1.2 --- account.cpp 9 Jun 2006 18:58:27 -0000 1.3 *************** *** 21,39 **** AccountObject::AccountObject( ! const int &accountNumber, ! const std::string &accountType) { ! account_ = boost::shared_ptr<Account>(new Account(accountNumber, accountType)); } void AccountObject::setBalance(const int &balance) { ! account_->setBalance(balance); } const int &AccountObject::getBalance() { ! return account_->getBalance(); ! } ! ! boost::shared_ptr<void> AccountObject::getReference() const { ! return boost::static_pointer_cast<void>(account_); } --- 21,35 ---- AccountObject::AccountObject( ! const int &accountNumber, ! const std::string &accountType) { ! libraryObject_ = boost::shared_ptr<Account>(new Account(accountNumber, accountType)); } void AccountObject::setBalance(const int &balance) { ! libraryObject_->setBalance(balance); } const int &AccountObject::getBalance() { ! return libraryObject_->getBalance(); } Index: addinstatic.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/addinstatic.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** addinstatic.cpp 6 Jun 2006 09:08:26 -0000 1.6 --- addinstatic.cpp 9 Jun 2006 18:58:27 -0000 1.7 *************** *** 17,26 **** #include <account.hpp> ! #include <xlsdk/xlsdk.hpp> ! #include <ohxl/conversions.hpp> #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, for example) also #define _MSC_VER --- 17,24 ---- #include <account.hpp> ! #include <ohxl/objhandlerxl.hpp> #include <ohxl/register.hpp> #include <ohxl/export.hpp> ! /* Use BOOST_MSVC instead of _MSC_VER since some other vendors (Metrowerks, for example) also #define _MSC_VER *************** *** 33,36 **** --- 31,37 ---- #include <sstream> + // instantiate objecthandler repository + ObjHandler::ObjectHandlerXL oh; + DLLEXPORT int xlAutoOpen() { static XLOPER xDll; *************** *** 86,90 **** functionCall = boost::shared_ptr < ObjHandler::FunctionCall > ( new ObjHandler::FunctionCall("createAccount") ); ! ObjHandler::obj_ptr objectPointer(new AccountObject( *accountNumber, accountType)); --- 87,91 ---- functionCall = boost::shared_ptr < ObjHandler::FunctionCall > ( new ObjHandler::FunctionCall("createAccount") ); ! boost::shared_ptr < ObjHandler::Object > objectPointer(new AccountObject( *accountNumber, accountType)); *************** *** 92,96 **** boost::shared_ptr<ObjHandler::ValueObject>( new AccountValueObject(instanceName, *accountNumber, accountType))); ! const std::string returnValue = ObjHandler::storeObject(instanceName, objectPointer); static char ret[XL_MAX_STR_LEN]; ObjHandler::stringToChar(ret, returnValue); --- 93,100 ---- boost::shared_ptr<ObjHandler::ValueObject>( new AccountValueObject(instanceName, *accountNumber, accountType))); ! ! const std::string returnValue = ! ObjHandler::ObjectHandler::instance().storeObject(instanceName, objectPointer); ! static char ret[XL_MAX_STR_LEN]; ObjHandler::stringToChar(ret, returnValue); *************** *** 111,115 **** functionCall = boost::shared_ptr < ObjHandler::FunctionCall > ( new ObjHandler::FunctionCall("createAccount") ); ! OH_GET_OBJECT(accountObject, instanceName, AccountObject) accountObject->setBalance(*balance); static short int ret = TRUE; --- 115,123 ---- functionCall = boost::shared_ptr < ObjHandler::FunctionCall > ( new ObjHandler::FunctionCall("createAccount") ); ! ! //OH_GET_OBJECT(accountObject, instanceName, AccountObject) ! boost::shared_ptr < AccountObject > accountObject = ! ObjHandler::ObjectHandler::instance().retrieveObject<AccountObject>(instanceName); ! accountObject->setBalance(*balance); static short int ret = TRUE; *************** *** 130,134 **** functionCall = boost::shared_ptr < ObjHandler::FunctionCall > ( new ObjHandler::FunctionCall("createAccount") ); ! OH_GET_OBJECT(accountObject, instanceName, AccountObject) static long ret; ret = accountObject->getBalance(); --- 138,146 ---- functionCall = boost::shared_ptr < ObjHandler::FunctionCall > ( new ObjHandler::FunctionCall("createAccount") ); ! ! //OH_GET_OBJECT(accountObject, instanceName, AccountObject) ! boost::shared_ptr < AccountObject > accountObject = ! ObjHandler::ObjectHandler::instance().retrieveObject<AccountObject>(instanceName); ! static long ret; ret = accountObject->getBalance(); Index: ExampleXllDynamic1_vc8.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/ExampleXllDynamic1_vc8.vcproj,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ExampleXllDynamic1_vc8.vcproj 8 Jun 2006 18:06:41 -0000 1.7 --- ExampleXllDynamic1_vc8.vcproj 9 Jun 2006 18:58:27 -0000 1.8 *************** *** 18,23 **** <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory=".\build\vc80\DebugCRTDLL" ! IntermediateDirectory=".\build\vc80\DebugCRTDLL" ConfigurationType="2" CharacterSet="1" --- 18,23 ---- <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory=".\buildXllDynamic1\vc80\DebugCRTDLL" ! IntermediateDirectory=".\buildXllDynamic1\vc80\DebugCRTDLL" ConfigurationType="2" CharacterSet="1" *************** *** 47,53 **** RuntimeLibrary="3" UsePrecompiledHeader="0" ! AssemblerListingLocation=".\build\vc80\DebugCRTDLL\" ! ObjectFile=".\build\vc80\DebugCRTDLL\" ! ProgramDataBaseFileName=".\build\vc80\DebugCRTDLL\vc80.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" --- 47,53 ---- RuntimeLibrary="3" UsePrecompiledHeader="0" ! AssemblerListingLocation=".\buildXllDynamic1\vc80\DebugCRTDLL\" ! ObjectFile=".\buildXllDynamic1\vc80\DebugCRTDLL\" ! ProgramDataBaseFileName=".\buildXllDynamic1\vc80\DebugCRTDLL\vc80.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" *************** *** 69,75 **** AdditionalLibraryDirectories="..\..\lib,..\..\xll" GenerateDebugInformation="true" ! ProgramDatabaseFile=".\build\vc80\DebugCRTDLL/ExampleXLLDynamic1-vc80-mt-gd-0_1_4.pdb" SubSystem="2" ! ImportLibrary=".\build\vc80\DebugCRTDLL/ExampleXLLDynamic1-vc80-mt-gd-0_1_4.lib" TargetMachine="1" /> --- 69,75 ---- AdditionalLibraryDirectories="..\..\lib,..\..\xll" GenerateDebugInformation="true" ! ProgramDatabaseFile=".\buildXllDynamic1\vc80\DebugCRTDLL\ExampleXLLDynamic1-vc80-mt-gd-0_1_4.pdb" SubSystem="2" ! ImportLibrary=".\buildXllDynamic1\vc80\DebugCRTDLL\ExampleXLLDynamic1-vc80-mt-gd-0_1_4.lib" TargetMachine="1" /> *************** *** 101,106 **** <Configuration Name="Release CRTDLL|Win32" ! OutputDirectory=".\build\vc80\ReleaseCRTDLL" ! IntermediateDirectory=".\build\vc80\ReleaseCRTDLL" ConfigurationType="2" CharacterSet="1" --- 101,106 ---- <Configuration Name="Release CRTDLL|Win32" ! OutputDirectory=".\buildXllDynamic1\vc80\ReleaseCRTDLL" ! IntermediateDirectory=".\buildXllDynamic1\vc80\ReleaseCRTDLL" ConfigurationType="2" CharacterSet="1" *************** *** 128,134 **** RuntimeLibrary="2" UsePrecompiledHeader="0" ! AssemblerListingLocation=".\build\vc80\ReleaseCRTDLL\" ! ObjectFile=".\build\vc80\ReleaseCRTDLL\" ! ProgramDataBaseFileName=".\build\vc80\ReleaseCRTDLL\vc80.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" --- 128,134 ---- RuntimeLibrary="2" UsePrecompiledHeader="0" ! AssemblerListingLocation=".\buildXllDynamic1\vc80\ReleaseCRTDLL\" ! ObjectFile=".\buildXllDynamic1\vc80\ReleaseCRTDLL\" ! ProgramDataBaseFileName=".\buildXllDynamic1\vc80\ReleaseCRTDLL\vc80.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" *************** *** 150,158 **** AdditionalLibraryDirectories="..\..\lib,..\..\xll" GenerateDebugInformation="false" ! ProgramDatabaseFile=".\build\vc80\DebugCRTDLL/ExampleXLLDynamic1-vc80-mt-gd-0_1_4.pdb" SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" ! ImportLibrary=".\build\vc80\ReleaseCRTDLL/ExampleXLLDynamic1-vc80-mt-0_1_4.lib" TargetMachine="1" /> --- 150,158 ---- AdditionalLibraryDirectories="..\..\lib,..\..\xll" GenerateDebugInformation="false" ! ProgramDatabaseFile=".\buildXllDynamic1\vc80\DebugCRTDLL\ExampleXLLDynamic1-vc80-mt-gd-0_1_4.pdb" SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" ! ImportLibrary=".\buildXllDynamic1\vc80\ReleaseCRTDLL\ExampleXLLDynamic1-vc80-mt-0_1_4.lib" TargetMachine="1" /> Index: addindynamic1.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/addindynamic1.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** addindynamic1.cpp 6 Jun 2006 09:08:26 -0000 1.6 --- addindynamic1.cpp 9 Jun 2006 18:58:27 -0000 1.7 *************** *** 16,24 **** */ - #include <oh/objhandler.hpp> #include <account.hpp> ! #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 --- 16,21 ---- */ #include <account.hpp> ! #include <ohxl/objhandlerxl.hpp> /* Use BOOST_MSVC instead of _MSC_VER since some other vendors (Metrowerks, for example) also #define _MSC_VER *************** *** 75,79 **** functionCall = boost::shared_ptr < ObjHandler::FunctionCall > ( new ObjHandler::FunctionCall("addin1CreateAccount") ); ! ObjHandler::obj_ptr objectPointer(new AccountObject( *accountNumber, accountType)); --- 72,76 ---- functionCall = boost::shared_ptr < ObjHandler::FunctionCall > ( new ObjHandler::FunctionCall("addin1CreateAccount") ); ! boost::shared_ptr < ObjHandler::Object > objectPointer(new AccountObject( *accountNumber, accountType)); *************** *** 81,85 **** boost::shared_ptr<ObjHandler::ValueObject>( new AccountValueObject(instanceName, *accountNumber, accountType))); ! const std::string returnValue = ObjHandler::storeObject(instanceName, objectPointer); static char ret[XL_MAX_STR_LEN]; ObjHandler::stringToChar(ret, returnValue); --- 78,85 ---- boost::shared_ptr<ObjHandler::ValueObject>( new AccountValueObject(instanceName, *accountNumber, accountType))); ! ! const std::string returnValue = ! ObjHandler::ObjectHandler::instance().storeObject(instanceName, objectPointer); ! static char ret[XL_MAX_STR_LEN]; ObjHandler::stringToChar(ret, returnValue); *************** *** 100,104 **** --- 100,106 ---- functionCall = boost::shared_ptr < ObjHandler::FunctionCall > ( new ObjHandler::FunctionCall("addin1SetBalance") ); + OH_GET_OBJECT(accountObject, instanceName, AccountObject) + accountObject->setBalance(*balance); static short int ret = TRUE; Index: ExampleXllDynamic2.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/ExampleXllDynamic2.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ExampleXllDynamic2.vcproj 1 Jun 2006 15:58:30 -0000 1.2 --- ExampleXllDynamic2.vcproj 9 Jun 2006 18:58:27 -0000 1.3 *************** *** 13,18 **** <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory=".\build\vc71\DebugCRTDLL" ! IntermediateDirectory=".\build\vc71\DebugCRTDLL" ConfigurationType="2" UseOfMFC="0" --- 13,18 ---- <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory=".\buildXllDynamic2\vc71\DebugCRTDLL" ! IntermediateDirectory=".\buildXllDynamic2\vc71\DebugCRTDLL" ConfigurationType="2" UseOfMFC="0" *************** *** 28,35 **** RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\DebugCRTDLL/ExampleXllDynamic2.pch" ! AssemblerListingLocation=".\build\vc71\DebugCRTDLL/" ! ObjectFile=".\build\vc71\DebugCRTDLL/" ! ProgramDataBaseFileName=".\build\vc71\DebugCRTDLL/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 28,35 ---- RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\buildXllDynamic2\vc71\DebugCRTDLL\ExampleXllDynamic2.pch" ! AssemblerListingLocation=".\buildXllDynamic2\vc71\DebugCRTDLL\" ! ObjectFile=".\buildXllDynamic2\vc71\DebugCRTDLL\" ! ProgramDataBaseFileName=".\buildXllDynamic2\vc71\DebugCRTDLL\" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 45,50 **** AdditionalLibraryDirectories="..\..\lib,..\..\xll" GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\build\vc71\DebugCRTDLL/ExampleXLLDynamic2-vc71-mt-gd-0_1_4.pdb" ! ImportLibrary=".\build\vc71\DebugCRTDLL/ExampleXLLDynamic2-vc71-mt-gd-0_1_4.lib" TargetMachine="1"/> <Tool --- 45,50 ---- AdditionalLibraryDirectories="..\..\lib,..\..\xll" GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\buildXllDynamic2\vc71\DebugCRTDLL\ExampleXLLDynamic2-vc71-mt-gd-0_1_4.pdb" ! ImportLibrary=".\buildXllDynamic2\vc71\DebugCRTDLL\ExampleXLLDynamic2-vc71-mt-gd-0_1_4.lib" TargetMachine="1"/> <Tool *************** *** 54,58 **** SuppressStartupBanner="TRUE" TargetEnvironment="1" ! TypeLibraryName=".\build\vc71\DebugCRTDLL/ExampleXllDynamic2.tlb" HeaderFileName=""/> <Tool --- 54,58 ---- SuppressStartupBanner="TRUE" TargetEnvironment="1" ! TypeLibraryName=".\buildXllDynamic2\vc71\DebugCRTDLL\ExampleXllDynamic2.tlb" HeaderFileName=""/> <Tool *************** *** 79,84 **** <Configuration Name="Release CRTDLL|Win32" ! OutputDirectory=".\build\vc71\ReleaseCRTDLL" ! IntermediateDirectory=".\build\vc71\ReleaseCRTDLL" ConfigurationType="2" UseOfMFC="0" --- 79,84 ---- <Configuration Name="Release CRTDLL|Win32" ! OutputDirectory=".\buildXllDynamic2\vc71\ReleaseCRTDLL" ! IntermediateDirectory=".\buildXllDynamic2\vc71\ReleaseCRTDLL" ConfigurationType="2" UseOfMFC="0" *************** *** 96,103 **** RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\ReleaseCRTDLL/ExampleXllDynamic2.pch" ! AssemblerListingLocation=".\build\vc71\ReleaseCRTDLL/" ! ObjectFile=".\build\vc71\ReleaseCRTDLL/" ! ProgramDataBaseFileName=".\build\vc71\ReleaseCRTDLL/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 96,103 ---- RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\buildXllDynamic2\vc71\ReleaseCRTDLL\ExampleXllDynamic2.pch" ! AssemblerListingLocation=".\buildXllDynamic2\vc71\ReleaseCRTDLL\" ! ObjectFile=".\buildXllDynamic2\vc71\ReleaseCRTDLL\" ! ProgramDataBaseFileName=".\buildXllDynamic2\vc71\ReleaseCRTDLL\" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 111,116 **** 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" TargetMachine="1"/> <Tool --- 111,116 ---- SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\lib,..\..\xll" ! ProgramDatabaseFile=".\buildXllDynamic2\vc71\ReleaseCRTDLL\ExampleXLLDynamic2-vc71-mt-0_1_4.pdb" ! ImportLibrary=".\buildXllDynamic2\vc71\ReleaseCRTDLL\ExampleXLLDynamic2-vc71-mt-0_1_4.lib" TargetMachine="1"/> <Tool *************** *** 120,124 **** SuppressStartupBanner="TRUE" TargetEnvironment="1" ! TypeLibraryName=".\build\vc71\ReleaseCRTDLL/ExampleXllDynamic2.tlb" HeaderFileName=""/> <Tool --- 120,124 ---- SuppressStartupBanner="TRUE" TargetEnvironment="1" ! TypeLibraryName=".\buildXllDynamic2\vc71\ReleaseCRTDLL\ExampleXllDynamic2.tlb" HeaderFileName=""/> <Tool Index: exampleDynamic.xls =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/exampleDynamic.xls,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsaJ1F3P and /tmp/cvstUCKyD differ Index: ExampleXllDynamic1.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/ExampleXllDynamic1.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ExampleXllDynamic1.vcproj 1 Jun 2006 15:58:30 -0000 1.2 --- ExampleXllDynamic1.vcproj 9 Jun 2006 18:58:27 -0000 1.3 *************** *** 13,18 **** <Configuration Name="Release CRTDLL|Win32" ! OutputDirectory=".\build\vc71\ReleaseCRTDLL" ! IntermediateDirectory=".\build\vc71\ReleaseCRTDLL" ConfigurationType="2" UseOfMFC="0" --- 13,18 ---- <Configuration Name="Release CRTDLL|Win32" ! OutputDirectory=".\buildExampleDynamic1\vc71\ReleaseCRTDLL" ! IntermediateDirectory=".\buildExampleDynamic1\vc71\ReleaseCRTDLL" ConfigurationType="2" UseOfMFC="0" *************** *** 30,37 **** RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\ReleaseCRTDLL/ExampleXllDynamic1.pch" ! AssemblerListingLocation=".\build\vc71\ReleaseCRTDLL/" ! ObjectFile=".\build\vc71\ReleaseCRTDLL/" ! ProgramDataBaseFileName=".\build\vc71\ReleaseCRTDLL/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 30,37 ---- RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\buildExampleDynamic1\vc71\ReleaseCRTDLL\ExampleXllDynamic1.pch" ! AssemblerListingLocation=".\buildExampleDynamic1\vc71\ReleaseCRTDLL\" ! ObjectFile=".\buildExampleDynamic1\vc71\ReleaseCRTDLL\" ! ProgramDataBaseFileName=".\buildExampleDynamic1\vc71\ReleaseCRTDLL\" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 45,50 **** 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" TargetMachine="1"/> <Tool --- 45,50 ---- SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\lib,..\..\xll" ! ProgramDatabaseFile=".\buildExampleDynamic1\vc71\ReleaseCRTDLL\ExampleXLLDynamic1-vc71-mt-0_1_4.pdb" ! ImportLibrary=".\buildExampleDynamic1\vc71\ReleaseCRTDLL\ExampleXLLDynamic1-vc71-mt-0_1_4.lib" TargetMachine="1"/> <Tool *************** *** 54,58 **** SuppressStartupBanner="TRUE" TargetEnvironment="1" ! TypeLibraryName=".\build\vc71\ReleaseCRTDLL/ExampleXllDynamic1.tlb" HeaderFileName=""/> <Tool --- 54,58 ---- SuppressStartupBanner="TRUE" TargetEnvironment="1" ! TypeLibraryName=".\buildExampleDynamic1\vc71\ReleaseCRTDLL\ExampleXllDynamic1.tlb" HeaderFileName=""/> <Tool *************** *** 79,84 **** <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory=".\build\vc71\DebugCRTDLL" ! IntermediateDirectory=".\build\vc71\DebugCRTDLL" ConfigurationType="2" UseOfMFC="0" --- 79,84 ---- <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory=".\buildExampleDynamic1\vc71\DebugCRTDLL" ! IntermediateDirectory=".\buildExampleDynamic1\vc71\DebugCRTDLL" ConfigurationType="2" UseOfMFC="0" *************** *** 94,101 **** RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\build\vc71\DebugCRTDLL/ExampleXllDynamic1.pch" ! AssemblerListingLocation=".\build\vc71\DebugCRTDLL/" ! ObjectFile=".\build\vc71\DebugCRTDLL/" ! ProgramDataBaseFileName=".\build\vc71\DebugCRTDLL/" WarningLevel="3" SuppressStartupBanner="TRUE" --- 94,101 ---- RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\buildExampleDynamic1\vc71\DebugCRTDLL\ExampleXllDynamic1.pch" ! AssemblerListingLocation=".\buildExampleDynamic1\vc71\DebugCRTDLL\" ! ObjectFile=".\buildExampleDynamic1\vc71\DebugCRTDLL\" ! ProgramDataBaseFileName=".\buildExampleDynamic1\vc71\DebugCRTDLL\" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 111,116 **** AdditionalLibraryDirectories="..\..\lib,..\..\xll" GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\build\vc71\DebugCRTDLL/ExampleXLLDynamic1-vc71-mt-gd-0_1_4.pdb" ! ImportLibrary=".\build\vc71\DebugCRTDLL/ExampleXLLDynamic1-vc71-mt-gd-0_1_4.lib" TargetMachine="1"/> <Tool --- 111,116 ---- AdditionalLibraryDirectories="..\..\lib,..\..\xll" GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\buildExampleDynamic1\vc71\DebugCRTDLL\ExampleXLLDynamic1-vc71-mt-gd-0_1_4.pdb" ! ImportLibrary=".\buildExampleDynamic1\vc71\DebugCRTDLL\ExampleXLLDynamic1-vc71-mt-gd-0_1_4.lib" TargetMachine="1"/> <Tool *************** *** 120,124 **** SuppressStartupBanner="TRUE" TargetEnvironment="1" ! TypeLibraryName=".\build\vc71\DebugCRTDLL/ExampleXllDynamic1.tlb" HeaderFileName=""/> <Tool --- 120,124 ---- SuppressStartupBanner="TRUE" TargetEnvironment="1" ! TypeLibraryName=".\buildExampleDynamic1\vc71\DebugCRTDLL\ExampleXllDynamic1.tlb" HeaderFileName=""/> <Tool Index: ExampleXllStatic_vc8.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/ExampleXllStatic_vc8.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ExampleXllStatic_vc8.vcproj 25 May 2006 17:01:56 -0000 1.5 --- ExampleXllStatic_vc8.vcproj 9 Jun 2006 18:58:27 -0000 1.6 *************** *** 16,21 **** <Configuration Name="Debug|Win32" ! OutputDirectory=".\build\vc80\Debug" ! IntermediateDirectory=".\build\vc80\Debug" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" --- 16,21 ---- <Configuration Name="Debug|Win32" ! OutputDirectory=".\buildXllStatic\vc80\Debug" ! IntermediateDirectory=".\buildXllStatic\vc80\Debug" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" *************** *** 42,46 **** SuppressStartupBanner="true" TargetEnvironment="1" ! TypeLibraryName=".\build\vc80\Debug/ExampleXllStatic.tlb" HeaderFileName="" /> --- 42,46 ---- SuppressStartupBanner="true" TargetEnvironment="1" ! TypeLibraryName=".\buildXllStatic\vc80\Debug\ExampleXllStatic.tlb" HeaderFileName="" /> *************** *** 54,61 **** RuntimeLibrary="1" RuntimeTypeInfo="true" ! PrecompiledHeaderFile=".\build\vc80\Debug/ExampleXllStatic.pch" ! AssemblerListingLocation=".\build\vc80\Debug/" ! ObjectFile=".\build\vc80\Debug/" ! ProgramDataBaseFileName=".\build\vc80\Debug/" WarningLevel="3" SuppressStartupBanner="true" --- 54,61 ---- RuntimeLibrary="1" RuntimeTypeInfo="true" ! PrecompiledHeaderFile=".\buildXllStatic\vc80\Debug\ExampleXllStatic.pch" ! AssemblerListingLocation=".\buildXllStatic\vc80\Debug\" ! ObjectFile=".\buildXllStatic\vc80\Debug\" ! ProgramDataBaseFileName=".\buildXllStatic\vc80\Debug\" WarningLevel="3" SuppressStartupBanner="true" *************** *** 79,86 **** LinkIncremental="2" SuppressStartupBanner="true" ! AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)/msvc/lib" GenerateDebugInformation="true" ! ProgramDatabaseFile=".\build\vc80\Debug/ExampleXLLStatic-vc80-mt-sgd-0_1_4.pdb" ! ImportLibrary=".\build\vc80\Debug/ExampleXLLStatic-vc80-mt-sgd-0_1_4.lib" TargetMachine="1" /> --- 79,86 ---- LinkIncremental="2" SuppressStartupBanner="true" ! AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\lib" GenerateDebugInformation="true" ! ProgramDatabaseFile=".\buildXllStatic\vc80\Debug\ExampleXLLStatic-vc80-mt-sgd-0_1_4.pdb" ! ImportLibrary=".\buildXllStatic\vc80\Debug\ExampleXLLStatic-vc80-mt-sgd-0_1_4.lib" TargetMachine="1" /> *************** *** 97,101 **** Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile=".\build\vc80\Debug/ExampleXllStatic.bsc" /> <Tool --- 97,101 ---- Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile=".\buildXllStatic\vc80\Debug\ExampleXllStatic.bsc" /> <Tool *************** *** 114,119 **** <Configuration Name="Release|Win32" ! OutputDirectory=".\build\vc80\Release" ! IntermediateDirectory=".\build\vc80\Release" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" --- 114,119 ---- <Configuration Name="Release|Win32" ! OutputDirectory=".\buildXllStatic\vc80\Release" ! IntermediateDirectory=".\buildXllStatic\vc80\Release" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" *************** *** 140,144 **** SuppressStartupBanner="true" TargetEnvironment="1" ! TypeLibraryName=".\build\vc80\Release/ExampleXllStatic.tlb" HeaderFileName="" /> --- 140,144 ---- SuppressStartupBanner="true" TargetEnvironment="1" ! TypeLibraryName=".\buildXllStatic\vc80\Release\ExampleXllStatic.tlb" HeaderFileName="" /> *************** *** 153,160 **** EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" ! PrecompiledHeaderFile=".\build\vc80\Release/ExampleXllStatic.pch" ! AssemblerListingLocation=".\build\vc80\Release/" ! ObjectFile=".\build\vc80\Release/" ! ProgramDataBaseFileName=".\build\vc80\Release/" WarningLevel="3" SuppressStartupBanner="true" --- 153,160 ---- EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" ! PrecompiledHeaderFile=".\buildXllStatic\vc80\Release\ExampleXllStatic.pch" ! AssemblerListingLocation=".\buildXllStatic\vc80\Release\" ! ObjectFile=".\buildXllStatic\vc80\Release\" ! ProgramDataBaseFileName=".\buildXllStatic\vc80\Release\" WarningLevel="3" SuppressStartupBanner="true" *************** *** 177,183 **** 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" TargetMachine="1" /> --- 177,183 ---- LinkIncremental="1" SuppressStartupBanner="true" ! AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\lib" ! ProgramDatabaseFile=".\buildXllStatic\vc80\Release\ExampleXLLStatic-vc80-mt-s-0_1_4.pdb" ! ImportLibrary=".\buildXllStatic\vc80\Release\ExampleXLLStatic-vc80-mt-s-0_1_4.lib" TargetMachine="1" /> *************** *** 194,198 **** Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile=".\build\vc80\Release/ExampleXllStatic.bsc" /> <Tool --- 194,198 ---- Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile=".\buildXllStatic\vc80\Release\ExampleXllStatic.bsc" /> <Tool *************** *** 211,216 **** <Configuration Name="Release CRTDLL|Win32" ! OutputDirectory=".\build\vc80\ReleaseCRTDLL" ! IntermediateDirectory=".\build\vc80\ReleaseCRTDLL" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" --- 211,216 ---- <Configuration Name="Release CRTDLL|Win32" ! OutputDirectory=".\buildXllStatic\vc80\ReleaseCRTDLL" ! IntermediateDirectory=".\buildXllStatic\vc80\ReleaseCRTDLL" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" *************** *** 237,241 **** SuppressStartupBanner="true" TargetEnvironment="1" ! TypeLibraryName=".\build\vc80\ReleaseCRTDLL/ExampleXllStatic.tlb" HeaderFileName="" /> --- 237,241 ---- SuppressStartupBanner="true" TargetEnvironment="1" ! TypeLibraryName=".\buildXllStatic\vc80\ReleaseCRTDLL\ExampleXllStatic.tlb" HeaderFileName="" /> *************** *** 250,257 **** EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" ! PrecompiledHeaderFile=".\build\vc80\ReleaseCRTDLL/ExampleXllStatic.pch" ! AssemblerListingLocation=".\build\vc80\ReleaseCRTDLL/" ! ObjectFile=".\build\vc80\ReleaseCRTDLL/" ! ProgramDataBaseFileName=".\build\vc80\ReleaseCRTDLL/" WarningLevel="3" SuppressStartupBanner="true" --- 250,257 ---- EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" ! PrecompiledHeaderFile=".\buildXllStatic\vc80\ReleaseCRTDLL\ExampleXllStatic.pch" ! AssemblerListingLocation=".\buildXllStatic\vc80\ReleaseCRTDLL\" ! ObjectFile=".\buildXllStatic\vc80\ReleaseCRTDLL\" ! ProgramDataBaseFileName=".\buildXllStatic\vc80\ReleaseCRTDLL\" WarningLevel="3" SuppressStartupBanner="true" *************** *** 274,280 **** 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" TargetMachine="1" /> --- 274,280 ---- LinkIncremental="1" SuppressStartupBanner="true" ! AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\lib" ! ProgramDatabaseFile=".\buildXllStatic\vc80\ReleaseCRTDLL\ExampleXLLStatic-vc80-mt-0_1_4.pdb" ! ImportLibrary=".\buildXllStatic\vc80\ReleaseCRTDLL\ExampleXLLStatic-vc80-mt-0_1_4.lib" TargetMachine="1" /> *************** *** 291,295 **** Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile=".\build\vc80\ReleaseCRTDLL/ExampleXllStatic.bsc" /> <Tool --- 291,295 ---- Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile=".\buildXllStatic\vc80\ReleaseCRTDLL\ExampleXllStatic.bsc" /> <Tool *************** *** 308,313 **** <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory=".\build\vc80\DebugCRTDLL" ! IntermediateDirectory=".\build\vc80\DebugCRTDLL" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" --- 308,313 ---- <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory=".\buildXllStatic\vc80\DebugCRTDLL" ! IntermediateDirectory=".\buildXllStatic\vc80\DebugCRTDLL" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" *************** *** 334,338 **** SuppressStartupBanner="true" TargetEnvironment="1" ! TypeLibraryName=".\build\vc80\DebugCRTDLL/ExampleXllStatic.tlb" HeaderFileName="" /> --- 334,338 ---- SuppressStartupBanner="true" TargetEnvironment="1" ! TypeLibraryName=".\buildXllStatic\vc80\DebugCRTDLL\ExampleXllStatic.tlb" HeaderFileName="" /> *************** *** 346,353 **** RuntimeLibrary="3" RuntimeTypeInfo="true" ! PrecompiledHeaderFile=".\build\vc80\DebugCRTDLL/ExampleXllStatic.pch" ! AssemblerListingLocation=".\build\vc80\DebugCRTDLL/" ! ObjectFile=".\build\vc80\DebugCRTDLL/" ! ProgramDataBaseFileName=".\build\vc80\DebugCRTDLL/" WarningLevel="3" SuppressStartupBanner="true" --- 346,353 ---- RuntimeLibrary="3" RuntimeTypeInfo="true" ! PrecompiledHeaderFile=".\buildXllStatic\vc80\DebugCRTDLL\ExampleXllStatic.pch" ! AssemblerListingLocation=".\buildXllStatic\vc80\DebugCRTDLL\" ! ObjectFile=".\buildXllStatic\vc80\DebugCRTDLL\" ! ProgramDataBaseFileName=".\buildXllStatic\vc80\DebugCRTDLL\" WarningLevel="3" SuppressStartupBanner="true" *************** *** 371,378 **** LinkIncremental="2" SuppressStartupBanner="true" ! AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)/msvc/lib" GenerateDebugInformation="true" ! ProgramDatabaseFile=".\build\vc80\DebugCRTDLL/ExampleXLLStatic-vc80-mt-gd-0_1_4.pdb" ! ImportLibrary=".\build\vc80\DebugCRTDLL/ExampleXLLStatic-vc80-mt-gd-0_1_4.lib" TargetMachine="1" /> --- 371,378 ---- LinkIncremental="2" SuppressStartupBanner="true" ! AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\lib" GenerateDebugInformation="true" ! ProgramDatabaseFile=".\buildXllStatic\vc80\DebugCRTDLL\ExampleXLLStatic-vc80-mt-gd-0_1_4.pdb" ! ImportLibrary=".\buildXllStatic\vc80\DebugCRTDLL\ExampleXLLStatic-vc80-mt-gd-0_1_4.lib" TargetMachine="1" /> *************** *** 389,393 **** Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile=".\build\vc80\DebugCRTDLL/ExampleXllStatic.bsc" /> <Tool --- 389,393 ---- Name="VCBscMakeTool" SuppressStartupBanner="true" ! OutputFile=".\buildXllStatic\vc80\DebugCRTDLL\ExampleXllStatic.bsc" /> <Tool |
|
From: Eric E. <eri...@us...> - 2006-06-09 18:58:30
|
Update of /cvsroot/objecthandler/ObjectHandler/ohxl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29781/ohxl Modified Files: objecthandlerxl.cpp objecthandlerxl.hpp Log Message: cleaner processing for object references Index: objecthandlerxl.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/objecthandlerxl.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** objecthandlerxl.cpp 2 Jun 2006 13:59:05 -0000 1.4 --- objecthandlerxl.cpp 9 Jun 2006 18:58:27 -0000 1.5 *************** *** 38,41 **** --- 38,56 ---- int ObjectHandlerXL::instanceNameCount_ = 0; + // std::map cannot be exported across DLL boundaries + // so instead we use a static variable + std::map < std::string, boost::shared_ptr < CallingRange > > callingRanges_; + + ObjectHandlerXL &ObjectHandlerXL::instance() { + if (instance_) { + ObjectHandlerXL *ret = dynamic_cast < ObjectHandlerXL* > (instance_); + if (ret) + return *ret; + else + throw std::exception("Attempt to reference uninitialized ObjectHandlerXL object"); + } else + throw std::exception("Attempt to reference uninitialized ObjectHandlerXL object"); + } + boost::shared_ptr < CallingRange > ObjectHandlerXL::getCallingRange() { *************** *** 93,97 **** std::string ObjectHandlerXL::storeObject( const std::string &instanceName, ! const obj_ptr &object) { boost::shared_ptr < CallingRange > callingRange = getCallingRange(); --- 108,112 ---- std::string ObjectHandlerXL::storeObject( const std::string &instanceName, ! const boost::shared_ptr < Object > &object) { boost::shared_ptr < CallingRange > callingRange = getCallingRange(); *************** *** 107,125 **** 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; --- 122,134 ---- instanceNameDerived = instanceName; ! checkName(instanceNameDerived); callingRange->registerObject(instanceNameDerived); ! std::string instanceNameCounter = ObjectHandler::storeObject(instanceNameDerived, object); return instanceNameCounter + "#" + callingRange->updateCount(); } ! boost::shared_ptr < Object > ObjectHandlerXL::retrieveObjectImpl(const std::string &instanceName) const { std::string instanceNameStub; int counterOffset = instanceName.length() - 5; *************** *** 128,132 **** else instanceNameStub = instanceName; ! return ObjectHandlerBase::retrieveObject(instanceNameStub); } --- 137,141 ---- else instanceNameStub = instanceName; ! return ObjectHandler::retrieveObjectImpl(instanceNameStub); } *************** *** 160,168 **** void ObjectHandlerXL::deleteAllObjects() { callingRanges_.clear(); ! ObjectHandlerBase::deleteAllObjects(); } void ObjectHandlerXL::dump(std::ostream& out) { ! ObjectHandlerBase::dump(out); out << std::endl << "calling ranges:"; --- 169,177 ---- void ObjectHandlerXL::deleteAllObjects() { callingRanges_.clear(); ! ObjectHandler::deleteAllObjects(); } void ObjectHandlerXL::dump(std::ostream& out) { ! ObjectHandler::dump(out); out << std::endl << "calling ranges:"; Index: objecthandlerxl.hpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/objecthandlerxl.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** objecthandlerxl.hpp 2 Jun 2006 13:59:05 -0000 1.4 --- objecthandlerxl.hpp 9 Jun 2006 18:58:27 -0000 1.5 *************** *** 23,27 **** #define ohxl_objecthandlerxl_hpp ! #include <oh/objecthandlerbase.hpp> //! ObjHandler --- 23,27 ---- #define ohxl_objecthandlerxl_hpp ! #include <oh/objecthandler.hpp> //! ObjHandler *************** *** 29,32 **** --- 29,33 ---- */ namespace ObjHandler { + class CallingRange; *************** *** 36,41 **** by the client application. */ ! class ObjectHandlerXL : public ObjectHandlerBase { public: //! Store Object with given instance name. /*! This function is optimized for the base case where the calling range --- 37,44 ---- by the client application. */ ! class DLL_API ObjectHandlerXL : public ObjectHandler { public: + static ObjectHandlerXL &instance(); + //! Store Object with given instance name. /*! This function is optimized for the base case where the calling range *************** *** 52,59 **** */ 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 --- 55,63 ---- */ virtual std::string storeObject(const std::string &instanceName, ! const boost::shared_ptr < Object > &object); ! virtual boost::shared_ptr < Object > retrieveObjectImpl(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 *************** *** 62,68 **** */ virtual void resetCaller(); virtual void dump(std::ostream&); private: - std::map < std::string, boost::shared_ptr < CallingRange > > callingRanges_; boost::shared_ptr < CallingRange > getCallingRange(); virtual std::string generateInstanceName(); --- 66,72 ---- */ virtual void resetCaller(); + virtual void dump(std::ostream&); private: boost::shared_ptr < CallingRange > getCallingRange(); virtual std::string generateInstanceName(); |
|
From: Eric E. <eri...@us...> - 2006-06-09 18:58:30
|
Update of /cvsroot/objecthandler/ObjectHandler/Examples/C++ In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29781/Examples/C++ Modified Files: account.cpp account.hpp example.cpp Log Message: cleaner processing for object references Index: example.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/C++/example.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** example.cpp 25 May 2006 17:01:56 -0000 1.3 --- example.cpp 9 Jun 2006 18:58:27 -0000 1.4 *************** *** 29,32 **** --- 29,34 ---- #include <exception> + ObjHandler::ObjectHandler oh; + int main() { try { *************** *** 46,50 **** try { // construct some objects and store them in the object handler ! ObjHandler::obj_ptr accountObject1(new AccountObject( 123456789, "savings")); --- 48,52 ---- try { // construct some objects and store them in the object handler ! boost::shared_ptr < ObjHandler::Object > accountObject1(new AccountObject( 123456789, "savings")); *************** *** 52,58 **** boost::shared_ptr<ObjHandler::ValueObject>(new AccountValueObject( "account1", 123456789, "savings"))); ! ObjHandler::storeObject("account1", accountObject1); ! ObjHandler::obj_ptr accountObject2(new AccountObject( 987654321, "current")); --- 54,60 ---- boost::shared_ptr<ObjHandler::ValueObject>(new AccountValueObject( "account1", 123456789, "savings"))); ! ObjHandler::ObjectHandler::instance().storeObject("account1", accountObject1); ! boost::shared_ptr < ObjHandler::Object > accountObject2(new AccountObject( 987654321, "current")); *************** *** 60,64 **** boost::shared_ptr<ObjHandler::ValueObject>(new AccountValueObject( "account2", 987654321, "current"))); ! ObjHandler::storeObject("account2", accountObject2); // high level interrogation --- 62,66 ---- boost::shared_ptr<ObjHandler::ValueObject>(new AccountValueObject( "account2", 987654321, "current"))); ! ObjHandler::ObjectHandler::instance().storeObject("account2", accountObject2); // high level interrogation *************** *** 67,77 **** // retrieve an object and update it ! OH_GET_OBJECT(accountObject2_retrieve, "account2", AccountObject) accountObject2_retrieve->setBalance(100); // low-level interrogation ObjHandler::logMessage("low-level interrogation - after update"); ! OH_GET_REFERENCE(accountObjectUnderlying, "account2", ! AccountObject, Account); std::ostringstream msg; msg << "result of getBalance on underlying = " << accountObjectUnderlying->getBalance(); --- 69,78 ---- // retrieve an object and update it ! OH_GET_OBJECT( accountObject2_retrieve, "account2", AccountObject ) accountObject2_retrieve->setBalance(100); // low-level interrogation ObjHandler::logMessage("low-level interrogation - after update"); ! OH_GET_REFERENCE( accountObjectUnderlying, "account2", AccountObject, Account ) \ std::ostringstream msg; msg << "result of getBalance on underlying = " << accountObjectUnderlying->getBalance(); Index: account.hpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/C++/account.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** account.hpp 19 May 2006 15:12:41 -0000 1.1 --- account.hpp 9 Jun 2006 18:58:27 -0000 1.2 *************** *** 20,30 **** #include <oh/objhandler.hpp> - #include <oh/valueobject.hpp> class Account { public: Account(const int &accountNumber, ! const std::string &accountType, ! const int &balance = 0) : accountNumber_(accountNumber), accountType_(accountType), balance_(balance) {} void setBalance(const int &balance) { --- 20,29 ---- #include <oh/objhandler.hpp> class Account { public: Account(const int &accountNumber, ! const std::string &accountType, ! const int &balance = 0) : accountNumber_(accountNumber), accountType_(accountType), balance_(balance) {} void setBalance(const int &balance) { *************** *** 40,52 **** }; ! class AccountObject : public ObjHandler::Object { public: ! AccountObject(const int &accountNumber, ! const std::string &accountType); void setBalance(const int &balance); const int &getBalance(); - virtual boost::shared_ptr<void> getReference() const; - private: - boost::shared_ptr<Account> account_; }; --- 39,49 ---- }; ! class AccountObject : public ObjHandler::LibraryObject<Account> { public: ! AccountObject( ! const int &accountNumber, ! const std::string &accountType); void setBalance(const int &balance); const int &getBalance(); }; Index: account.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/C++/account.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** account.cpp 19 May 2006 15:12:41 -0000 1.1 --- account.cpp 9 Jun 2006 18:58:27 -0000 1.2 *************** *** 21,39 **** AccountObject::AccountObject( ! const int &accountNumber, ! const std::string &accountType) { ! account_ = boost::shared_ptr<Account>(new Account(accountNumber, accountType)); } void AccountObject::setBalance(const int &balance) { ! account_->setBalance(balance); } const int &AccountObject::getBalance() { ! return account_->getBalance(); ! } ! ! boost::shared_ptr<void> AccountObject::getReference() const { ! return boost::static_pointer_cast<void>(account_); } --- 21,35 ---- AccountObject::AccountObject( ! const int &accountNumber, ! const std::string &accountType) { ! libraryObject_ = boost::shared_ptr<Account>(new Account(accountNumber, accountType)); } void AccountObject::setBalance(const int &balance) { ! libraryObject_->setBalance(balance); } const int &AccountObject::getBalance() { ! return libraryObject_->getBalance(); } *************** *** 44,56 **** std::vector<std::string> AccountValueObject::getPropertyNames() const { - #ifdef OBJHANDLER_PATCH_MSVC6 - std::vector<std::string> ret; - const int max = sizeof(mPropertyNames)/sizeof(const char*); - for (int i=0; i<max; i++) ret.push_back(mPropertyNames[i]); - return ret; - #else return std::vector<std::string>( mPropertyNames, mPropertyNames + sizeof(mPropertyNames)/sizeof(const char*)); - #endif } --- 40,45 ---- |
|
From: Ferdinando A. <na...@us...> - 2006-06-09 18:50:11
|
Update of /cvsroot/objecthandler/ObjectHandler/gensrc In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26228/gensrc Modified Files: gensrc.vcproj Log Message: VC71 catching up Index: gensrc.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/gensrc/gensrc.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** gensrc.vcproj 8 Jun 2006 14:52:11 -0000 1.2 --- gensrc.vcproj 9 Jun 2006 18:50:04 -0000 1.3 *************** *** 13,18 **** <Configuration Name="All|Win32" ! OutputDirectory="Debug" ! IntermediateDirectory="Debug" ConfigurationType="0"> <Tool --- 13,18 ---- <Configuration Name="All|Win32" ! OutputDirectory="build\vc" ! IntermediateDirectory="build\vc" ConfigurationType="0"> <Tool |
|
From: Eric E. <eri...@us...> - 2006-06-08 18:06:48
|
Update of /cvsroot/objecthandler/ObjectHandler/Examples/xl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2178/Examples/xl Modified Files: ExampleXllDynamic1_vc8.vcproj Log Message: fix corrupt workspace for ExampleXllDynamic1 Index: ExampleXllDynamic1_vc8.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/ExampleXllDynamic1_vc8.vcproj,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ExampleXllDynamic1_vc8.vcproj 8 Jun 2006 17:48:59 -0000 1.6 --- ExampleXllDynamic1_vc8.vcproj 8 Jun 2006 18:06:41 -0000 1.7 *************** *** 51,55 **** ProgramDataBaseFileName=".\build\vc80\DebugCRTDLL\vc80.pdb" WarningLevel="3" ! Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> --- 51,55 ---- ProgramDataBaseFileName=".\build\vc80\DebugCRTDLL\vc80.pdb" WarningLevel="3" ! Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> *************** *** 69,73 **** AdditionalLibraryDirectories="..\..\lib,..\..\xll" GenerateDebugInformation="true" ! ProgramDatabaseFile=".\build\vc80\DebugCRTDLL\" SubSystem="2" ImportLibrary=".\build\vc80\DebugCRTDLL/ExampleXLLDynamic1-vc80-mt-gd-0_1_4.lib" --- 69,73 ---- AdditionalLibraryDirectories="..\..\lib,..\..\xll" GenerateDebugInformation="true" ! ProgramDatabaseFile=".\build\vc80\DebugCRTDLL/ExampleXLLDynamic1-vc80-mt-gd-0_1_4.pdb" SubSystem="2" ImportLibrary=".\build\vc80\DebugCRTDLL/ExampleXLLDynamic1-vc80-mt-gd-0_1_4.lib" *************** *** 150,154 **** AdditionalLibraryDirectories="..\..\lib,..\..\xll" GenerateDebugInformation="false" ! ProgramDatabaseFile=".\build\vc80\ReleaseCRTDLL\" SubSystem="2" OptimizeReferences="2" --- 150,154 ---- AdditionalLibraryDirectories="..\..\lib,..\..\xll" GenerateDebugInformation="false" ! ProgramDatabaseFile=".\build\vc80\DebugCRTDLL/ExampleXLLDynamic1-vc80-mt-gd-0_1_4.pdb" SubSystem="2" OptimizeReferences="2" |
|
From: Eric E. <eri...@us...> - 2006-06-08 17:49:14
|
Update of /cvsroot/objecthandler/ObjectHandler In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26674 Modified Files: ObjectHandler_vc8.sln Log Message: fix corrupt workspace for ExampleXllDynamic1 Index: ObjectHandler_vc8.sln =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ObjectHandler_vc8.sln,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ObjectHandler_vc8.sln 6 Jun 2006 17:50:42 -0000 1.6 --- ObjectHandler_vc8.sln 8 Jun 2006 17:48:59 -0000 1.7 *************** *** 23,34 **** Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ohxll", "ohxl\ohxll\ohxll_vc8.vcproj", "{04D7369F-47BC-46B0-A374-41635A9656D8}" ProjectSection(ProjectDependencies) = postProject - {4BD77A1E-AAE9-47A4-81FE-2308E5A460AF} = {4BD77A1E-AAE9-47A4-81FE-2308E5A460AF} {88BE5568-6E55-41C5-A251-670FAFB44336} = {88BE5568-6E55-41C5-A251-670FAFB44336} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ohxllib", "ohxl\ohxllib\ohxllib_vc8.vcproj", "{66021664-4359-442C-ACC7-7C82F51C9D5A}" ProjectSection(ProjectDependencies) = postProject - {4BD77A1E-AAE9-47A4-81FE-2308E5A460AF} = {4BD77A1E-AAE9-47A4-81FE-2308E5A460AF} {88BE5568-6E55-41C5-A251-670FAFB44336} = {88BE5568-6E55-41C5-A251-670FAFB44336} EndProjectSection EndProject --- 23,34 ---- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ohxll", "ohxl\ohxll\ohxll_vc8.vcproj", "{04D7369F-47BC-46B0-A374-41635A9656D8}" ProjectSection(ProjectDependencies) = postProject {88BE5568-6E55-41C5-A251-670FAFB44336} = {88BE5568-6E55-41C5-A251-670FAFB44336} + {4BD77A1E-AAE9-47A4-81FE-2308E5A460AF} = {4BD77A1E-AAE9-47A4-81FE-2308E5A460AF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ohxllib", "ohxl\ohxllib\ohxllib_vc8.vcproj", "{66021664-4359-442C-ACC7-7C82F51C9D5A}" ProjectSection(ProjectDependencies) = postProject {88BE5568-6E55-41C5-A251-670FAFB44336} = {88BE5568-6E55-41C5-A251-670FAFB44336} + {4BD77A1E-AAE9-47A4-81FE-2308E5A460AF} = {4BD77A1E-AAE9-47A4-81FE-2308E5A460AF} EndProjectSection EndProject *************** *** 37,44 **** Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gensrc", "gensrc\gensrc_vc8.vcproj", "{88BE5568-6E55-41C5-A251-670FAFB44336}" EndProject ! 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 --- 37,44 ---- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gensrc", "gensrc\gensrc_vc8.vcproj", "{88BE5568-6E55-41C5-A251-670FAFB44336}" EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExampleXllDynamic1", "Examples\xl\ExampleXllDynamic1_vc8.vcproj", "{BB902802-D59B-466F-ABB6-23368860D803}" 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 *************** *** 132,145 **** {88BE5568-6E55-41C5-A251-670FAFB44336}.Release|Win32.ActiveCfg = All|Win32 {88BE5568-6E55-41C5-A251-670FAFB44336}.Release|Win32.Build.0 = All|Win32 ! {CFC78C89-EFD2-400A-8860-40320E6FCA60}.All|Win32.ActiveCfg = Debug CRTDLL|Win32 ! {CFC78C89-EFD2-400A-8860-40320E6FCA60}.All|Win32.Build.0 = Debug CRTDLL|Win32 ! {CFC78C89-EFD2-400A-8860-40320E6FCA60}.Debug CRTDLL|Win32.ActiveCfg = Debug CRTDLL|Win32 ! {CFC78C89-EFD2-400A-8860-40320E6FCA60}.Debug CRTDLL|Win32.Build.0 = Debug CRTDLL|Win32 ! {CFC78C89-EFD2-400A-8860-40320E6FCA60}.Debug|Win32.ActiveCfg = Debug CRTDLL|Win32 ! {CFC78C89-EFD2-400A-8860-40320E6FCA60}.Debug|Win32.Build.0 = Debug CRTDLL|Win32 ! {CFC78C89-EFD2-400A-8860-40320E6FCA60}.Release CRTDLL|Win32.ActiveCfg = Release CRTDLL|Win32 ! {CFC78C89-EFD2-400A-8860-40320E6FCA60}.Release CRTDLL|Win32.Build.0 = Release CRTDLL|Win32 ! {CFC78C89-EFD2-400A-8860-40320E6FCA60}.Release|Win32.ActiveCfg = Release CRTDLL|Win32 ! {CFC78C89-EFD2-400A-8860-40320E6FCA60}.Release|Win32.Build.0 = Release CRTDLL|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution --- 132,145 ---- {88BE5568-6E55-41C5-A251-670FAFB44336}.Release|Win32.ActiveCfg = All|Win32 {88BE5568-6E55-41C5-A251-670FAFB44336}.Release|Win32.Build.0 = All|Win32 ! {BB902802-D59B-466F-ABB6-23368860D803}.All|Win32.ActiveCfg = Release CRTDLL|Win32 ! {BB902802-D59B-466F-ABB6-23368860D803}.All|Win32.Build.0 = Release CRTDLL|Win32 ! {BB902802-D59B-466F-ABB6-23368860D803}.Debug CRTDLL|Win32.ActiveCfg = Debug CRTDLL|Win32 ! {BB902802-D59B-466F-ABB6-23368860D803}.Debug CRTDLL|Win32.Build.0 = Debug CRTDLL|Win32 ! {BB902802-D59B-466F-ABB6-23368860D803}.Debug|Win32.ActiveCfg = Debug CRTDLL|Win32 ! {BB902802-D59B-466F-ABB6-23368860D803}.Debug|Win32.Build.0 = Debug CRTDLL|Win32 ! {BB902802-D59B-466F-ABB6-23368860D803}.Release CRTDLL|Win32.ActiveCfg = Release CRTDLL|Win32 ! {BB902802-D59B-466F-ABB6-23368860D803}.Release CRTDLL|Win32.Build.0 = Release CRTDLL|Win32 ! {BB902802-D59B-466F-ABB6-23368860D803}.Release|Win32.ActiveCfg = Release CRTDLL|Win32 ! {BB902802-D59B-466F-ABB6-23368860D803}.Release|Win32.Build.0 = Release CRTDLL|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution |
|
From: Eric E. <eri...@us...> - 2006-06-08 17:49:08
|
Update of /cvsroot/objecthandler/ObjectHandler/Examples/xl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26674/Examples/xl Modified Files: ExampleXllDynamic1_vc8.vcproj Log Message: fix corrupt workspace for ExampleXllDynamic1 Index: ExampleXllDynamic1_vc8.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/ExampleXllDynamic1_vc8.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ExampleXllDynamic1_vc8.vcproj 25 May 2006 10:19:00 -0000 1.5 --- ExampleXllDynamic1_vc8.vcproj 8 Jun 2006 17:48:59 -0000 1.6 *************** *** 4,8 **** Version="8.00" Name="ExampleXllDynamic1" ! ProjectGUID="{CFC78C89-EFD2-400A-8860-40320E6FCA60}" > <Platforms> --- 4,10 ---- Version="8.00" Name="ExampleXllDynamic1" ! ProjectGUID="{BB902802-D59B-466F-ABB6-23368860D803}" ! RootNamespace="ExampleXllDynamic1" ! Keyword="Win32Proj" > <Platforms> *************** *** 15,26 **** <Configurations> <Configuration ! Name="Release CRTDLL|Win32" ! OutputDirectory=".\build\vc80\ReleaseCRTDLL" ! IntermediateDirectory=".\build\vc80\ReleaseCRTDLL" ConfigurationType="2" ! InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="false" ! CharacterSet="2" > <Tool --- 17,25 ---- <Configurations> <Configuration ! Name="Debug CRTDLL|Win32" ! OutputDirectory=".\build\vc80\DebugCRTDLL" ! IntermediateDirectory=".\build\vc80\DebugCRTDLL" ConfigurationType="2" ! CharacterSet="1" > <Tool *************** *** 38,64 **** <Tool Name="VCMIDLTool" - PreprocessorDefinitions="NDEBUG" - MkTypLibCompatible="true" - SuppressStartupBanner="true" - TargetEnvironment="1" - TypeLibraryName=".\build\vc80\ReleaseCRTDLL/ExampleXllDynamic1.tlb" - HeaderFileName="" /> <Tool Name="VCCLCompilerTool" ! Optimization="2" ! InlineFunctionExpansion="1" AdditionalIncludeDirectories=".,..\.." ! PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;WIN32;XLL_IMPORTS;LOG4CXX_STATIC" ! StringPooling="true" ! RuntimeLibrary="2" ! EnableFunctionLevelLinking="true" ! RuntimeTypeInfo="true" ! PrecompiledHeaderFile=".\build\vc80\ReleaseCRTDLL/ExampleXllDynamic1.pch" ! AssemblerListingLocation=".\build\vc80\ReleaseCRTDLL/" ! ObjectFile=".\build\vc80\ReleaseCRTDLL/" ! ProgramDataBaseFileName=".\build\vc80\ReleaseCRTDLL/" WarningLevel="3" ! SuppressStartupBanner="true" /> <Tool --- 37,56 ---- <Tool Name="VCMIDLTool" /> <Tool Name="VCCLCompilerTool" ! Optimization="0" AdditionalIncludeDirectories=".,..\.." ! PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;WIN32;XLL_IMPORTS;LOG4CXX_STATIC" ! MinimalRebuild="true" ! BasicRuntimeChecks="3" ! RuntimeLibrary="3" ! UsePrecompiledHeader="0" ! AssemblerListingLocation=".\build\vc80\DebugCRTDLL\" ! ObjectFile=".\build\vc80\DebugCRTDLL\" ! ProgramDataBaseFileName=".\build\vc80\DebugCRTDLL\vc80.pdb" WarningLevel="3" ! Detect64BitPortabilityProblems="true" ! DebugInformationFormat="4" /> <Tool *************** *** 67,72 **** <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="2057" /> <Tool --- 59,62 ---- *************** *** 75,85 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="odbc32.lib odbccp32.lib" ! OutputFile="xll\ExampleXLLDynamic1-vc80-mt-0_1_4.xll" ! LinkIncremental="1" ! SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib,..\..\xll" ! ProgramDatabaseFile=".\build\vc80\ReleaseCRTDLL/" ! ImportLibrary=".\build\vc80\ReleaseCRTDLL/ExampleXLLDynamic1-vc80-mt-0_1_4.lib" TargetMachine="1" /> --- 65,75 ---- <Tool Name="VCLinkerTool" ! OutputFile="xll\ExampleXLLDynamic1-vc80-mt-gd-0_1_4.xll" ! LinkIncremental="2" AdditionalLibraryDirectories="..\..\lib,..\..\xll" ! GenerateDebugInformation="true" ! ProgramDatabaseFile=".\build\vc80\DebugCRTDLL\" ! SubSystem="2" ! ImportLibrary=".\build\vc80\DebugCRTDLL/ExampleXLLDynamic1-vc80-mt-gd-0_1_4.lib" TargetMachine="1" /> *************** *** 95,100 **** <Tool Name="VCBscMakeTool" - SuppressStartupBanner="true" - OutputFile=".\build\vc80\ReleaseCRTDLL/ExampleXllDynamic1.bsc" /> <Tool --- 85,88 ---- *************** *** 112,123 **** </Configuration> <Configuration ! Name="Debug CRTDLL|Win32" ! OutputDirectory=".\build\vc80\DebugCRTDLL" ! IntermediateDirectory=".\build\vc80\DebugCRTDLL" ConfigurationType="2" ! InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="false" ! CharacterSet="2" > <Tool --- 100,109 ---- </Configuration> <Configuration ! Name="Release CRTDLL|Win32" ! OutputDirectory=".\build\vc80\ReleaseCRTDLL" ! IntermediateDirectory=".\build\vc80\ReleaseCRTDLL" ConfigurationType="2" ! CharacterSet="1" ! WholeProgramOptimization="1" > <Tool *************** *** 135,161 **** <Tool Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" - MkTypLibCompatible="true" - SuppressStartupBanner="true" - TargetEnvironment="1" - TypeLibraryName=".\build\vc80\DebugCRTDLL/ExampleXllDynamic1.tlb" - HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories=".,..\.." ! PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;WIN32;XLL_IMPORTS;LOG4CXX_STATIC" ! MinimalRebuild="true" ! BasicRuntimeChecks="3" ! RuntimeLibrary="3" ! RuntimeTypeInfo="true" ! PrecompiledHeaderFile=".\build\vc80\DebugCRTDLL/ExampleXllDynamic1.pch" ! AssemblerListingLocation=".\build\vc80\DebugCRTDLL/" ! ObjectFile=".\build\vc80\DebugCRTDLL/" ! ProgramDataBaseFileName=".\build\vc80\DebugCRTDLL/" WarningLevel="3" ! SuppressStartupBanner="true" ! DebugInformationFormat="4" /> <Tool --- 121,137 ---- <Tool Name="VCMIDLTool" /> <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=".,..\.." ! PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;WIN32;XLL_IMPORTS;LOG4CXX_STATIC" ! RuntimeLibrary="2" ! UsePrecompiledHeader="0" ! AssemblerListingLocation=".\build\vc80\ReleaseCRTDLL\" ! ObjectFile=".\build\vc80\ReleaseCRTDLL\" ! ProgramDataBaseFileName=".\build\vc80\ReleaseCRTDLL\vc80.pdb" WarningLevel="3" ! Detect64BitPortabilityProblems="false" ! DebugInformationFormat="0" /> <Tool *************** *** 164,169 **** <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="2057" /> <Tool --- 140,143 ---- *************** *** 172,183 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="odbc32.lib odbccp32.lib" ! OutputFile="xll\ExampleXLLDynamic1-vc80-mt-gd-0_1_4.xll" ! LinkIncremental="2" ! SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib,..\..\xll" ! GenerateDebugInformation="true" ! ProgramDatabaseFile=".\build\vc80\DebugCRTDLL/" ! ImportLibrary=".\build\vc80\DebugCRTDLL/ExampleXLLDynamic1-vc80-mt-gd-0_1_4.lib" TargetMachine="1" /> --- 146,158 ---- <Tool Name="VCLinkerTool" ! OutputFile="xll\ExampleXLLDynamic1-vc80-mt-0_1_4.xll" ! LinkIncremental="1" AdditionalLibraryDirectories="..\..\lib,..\..\xll" ! GenerateDebugInformation="false" ! ProgramDatabaseFile=".\build\vc80\ReleaseCRTDLL\" ! SubSystem="2" ! OptimizeReferences="2" ! EnableCOMDATFolding="2" ! ImportLibrary=".\build\vc80\ReleaseCRTDLL/ExampleXLLDynamic1-vc80-mt-0_1_4.lib" TargetMachine="1" /> *************** *** 193,198 **** <Tool Name="VCBscMakeTool" - SuppressStartupBanner="true" - OutputFile=".\build\vc80\DebugCRTDLL/ExampleXllDynamic1.bsc" /> <Tool --- 168,171 ---- *************** *** 214,226 **** <Files> <File ! RelativePath="account.cpp" > </File> <File ! RelativePath="account.hpp" > </File> <File ! RelativePath="addindynamic1.cpp" > </File> --- 187,199 ---- <Files> <File ! RelativePath=".\account.cpp" > </File> <File ! RelativePath=".\account.hpp" > </File> <File ! RelativePath=".\addindynamic1.cpp" > </File> |
|
From: Marco B. <mar...@us...> - 2006-06-08 14:52:27
|
Update of /cvsroot/objecthandler/ObjectHandler In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9697 Modified Files: ObjectHandler.sln Log Message: update VC7 workspaces Index: ObjectHandler.sln =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ObjectHandler.sln,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ObjectHandler.sln 19 May 2006 15:12:41 -0000 1.1 --- ObjectHandler.sln 8 Jun 2006 14:52:11 -0000 1.2 *************** *** 22,25 **** --- 22,26 ---- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ohlib", "ohlib.vcproj", "{238AAC7B-E8AE-4BF3-8683-FA96A0203FD0}" ProjectSection(ProjectDependencies) = postProject + {19C36A53-51F2-4951-9A38-CCF6A250814F} = {19C36A53-51F2-4951-9A38-CCF6A250814F} EndProjectSection EndProject *************** *** 27,30 **** --- 28,32 ---- ProjectSection(ProjectDependencies) = postProject {60CA9440-286D-4BF9-BC36-7FBA5E448655} = {60CA9440-286D-4BF9-BC36-7FBA5E448655} + {19C36A53-51F2-4951-9A38-CCF6A250814F} = {19C36A53-51F2-4951-9A38-CCF6A250814F} EndProjectSection EndProject *************** *** 32,35 **** --- 34,38 ---- ProjectSection(ProjectDependencies) = postProject {60CA9440-286D-4BF9-BC36-7FBA5E448655} = {60CA9440-286D-4BF9-BC36-7FBA5E448655} + {19C36A53-51F2-4951-9A38-CCF6A250814F} = {19C36A53-51F2-4951-9A38-CCF6A250814F} EndProjectSection EndProject *************** *** 38,43 **** --- 41,51 ---- EndProjectSection EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gensrc", "gensrc\gensrc.vcproj", "{19C36A53-51F2-4951-9A38-CCF6A250814F}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection + EndProject Global GlobalSection(SolutionConfiguration) = preSolution + All = All Debug = Debug Debug CRTDLL = Debug CRTDLL *************** *** 48,51 **** --- 56,61 ---- EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution + {2CCCD17C-2C60-4784-8C95-37B2597B2F18}.All.ActiveCfg = Debug CRTDLL|Win32 + {2CCCD17C-2C60-4784-8C95-37B2597B2F18}.All.Build.0 = Debug CRTDLL|Win32 {2CCCD17C-2C60-4784-8C95-37B2597B2F18}.Debug.ActiveCfg = Debug|Win32 {2CCCD17C-2C60-4784-8C95-37B2597B2F18}.Debug.Build.0 = Debug|Win32 *************** *** 60,65 **** {2CCCD17C-2C60-4784-8C95-37B2597B2F18}.Release SingleThread.ActiveCfg = Release SingleThread|Win32 {2CCCD17C-2C60-4784-8C95-37B2597B2F18}.Release SingleThread.Build.0 = Release SingleThread|Win32 {23098765-3A5E-4598-9F1B-3E45F8230C90}.Debug.ActiveCfg = Debug CRTDLL|Win32 - {23098765-3A5E-4598-9F1B-3E45F8230C90}.Debug.Build.0 = Debug CRTDLL|Win32 {23098765-3A5E-4598-9F1B-3E45F8230C90}.Debug CRTDLL.ActiveCfg = Debug CRTDLL|Win32 {23098765-3A5E-4598-9F1B-3E45F8230C90}.Debug CRTDLL.Build.0 = Debug CRTDLL|Win32 --- 70,76 ---- {2CCCD17C-2C60-4784-8C95-37B2597B2F18}.Release SingleThread.ActiveCfg = Release SingleThread|Win32 {2CCCD17C-2C60-4784-8C95-37B2597B2F18}.Release SingleThread.Build.0 = Release SingleThread|Win32 + {23098765-3A5E-4598-9F1B-3E45F8230C90}.All.ActiveCfg = Debug CRTDLL|Win32 + {23098765-3A5E-4598-9F1B-3E45F8230C90}.All.Build.0 = Debug CRTDLL|Win32 {23098765-3A5E-4598-9F1B-3E45F8230C90}.Debug.ActiveCfg = Debug CRTDLL|Win32 {23098765-3A5E-4598-9F1B-3E45F8230C90}.Debug CRTDLL.ActiveCfg = Debug CRTDLL|Win32 {23098765-3A5E-4598-9F1B-3E45F8230C90}.Debug CRTDLL.Build.0 = Debug CRTDLL|Win32 *************** *** 72,77 **** {23098765-3A5E-4598-9F1B-3E45F8230C90}.Release SingleThread.ActiveCfg = Release CRTDLL|Win32 {23098765-3A5E-4598-9F1B-3E45F8230C90}.Release SingleThread.Build.0 = Release CRTDLL|Win32 {DC4DE1B1-E952-4153-B3A2-79169C6E55FA}.Debug.ActiveCfg = Debug CRTDLL|Win32 - {DC4DE1B1-E952-4153-B3A2-79169C6E55FA}.Debug.Build.0 = Debug CRTDLL|Win32 {DC4DE1B1-E952-4153-B3A2-79169C6E55FA}.Debug CRTDLL.ActiveCfg = Debug CRTDLL|Win32 {DC4DE1B1-E952-4153-B3A2-79169C6E55FA}.Debug CRTDLL.Build.0 = Debug CRTDLL|Win32 --- 83,89 ---- {23098765-3A5E-4598-9F1B-3E45F8230C90}.Release SingleThread.ActiveCfg = Release CRTDLL|Win32 {23098765-3A5E-4598-9F1B-3E45F8230C90}.Release SingleThread.Build.0 = Release CRTDLL|Win32 + {DC4DE1B1-E952-4153-B3A2-79169C6E55FA}.All.ActiveCfg = Release CRTDLL|Win32 + {DC4DE1B1-E952-4153-B3A2-79169C6E55FA}.All.Build.0 = Release CRTDLL|Win32 {DC4DE1B1-E952-4153-B3A2-79169C6E55FA}.Debug.ActiveCfg = Debug CRTDLL|Win32 {DC4DE1B1-E952-4153-B3A2-79169C6E55FA}.Debug CRTDLL.ActiveCfg = Debug CRTDLL|Win32 {DC4DE1B1-E952-4153-B3A2-79169C6E55FA}.Debug CRTDLL.Build.0 = Debug CRTDLL|Win32 *************** *** 84,87 **** --- 96,101 ---- {DC4DE1B1-E952-4153-B3A2-79169C6E55FA}.Release SingleThread.ActiveCfg = Release CRTDLL|Win32 {DC4DE1B1-E952-4153-B3A2-79169C6E55FA}.Release SingleThread.Build.0 = Release CRTDLL|Win32 + {CBED43D9-77CB-423D-99E4-6A36F6E56E5C}.All.ActiveCfg = Debug CRTDLL|Win32 + {CBED43D9-77CB-423D-99E4-6A36F6E56E5C}.All.Build.0 = Debug CRTDLL|Win32 {CBED43D9-77CB-423D-99E4-6A36F6E56E5C}.Debug.ActiveCfg = Debug|Win32 {CBED43D9-77CB-423D-99E4-6A36F6E56E5C}.Debug.Build.0 = Debug|Win32 *************** *** 96,99 **** --- 110,115 ---- {CBED43D9-77CB-423D-99E4-6A36F6E56E5C}.Release SingleThread.ActiveCfg = Release SingleThread|Win32 {CBED43D9-77CB-423D-99E4-6A36F6E56E5C}.Release SingleThread.Build.0 = Release SingleThread|Win32 + {238AAC7B-E8AE-4BF3-8683-FA96A0203FD0}.All.ActiveCfg = Debug CRTDLL|Win32 + {238AAC7B-E8AE-4BF3-8683-FA96A0203FD0}.All.Build.0 = Debug CRTDLL|Win32 {238AAC7B-E8AE-4BF3-8683-FA96A0203FD0}.Debug.ActiveCfg = Debug|Win32 {238AAC7B-E8AE-4BF3-8683-FA96A0203FD0}.Debug.Build.0 = Debug|Win32 *************** *** 108,113 **** {238AAC7B-E8AE-4BF3-8683-FA96A0203FD0}.Release SingleThread.ActiveCfg = Release SingleThread|Win32 {238AAC7B-E8AE-4BF3-8683-FA96A0203FD0}.Release SingleThread.Build.0 = Release SingleThread|Win32 {C7D99E56-35A9-46F9-BD2B-726CD3150869}.Debug.ActiveCfg = Debug CRTDLL|Win32 - {C7D99E56-35A9-46F9-BD2B-726CD3150869}.Debug.Build.0 = Debug CRTDLL|Win32 {C7D99E56-35A9-46F9-BD2B-726CD3150869}.Debug CRTDLL.ActiveCfg = Debug CRTDLL|Win32 {C7D99E56-35A9-46F9-BD2B-726CD3150869}.Debug CRTDLL.Build.0 = Debug CRTDLL|Win32 --- 124,130 ---- {238AAC7B-E8AE-4BF3-8683-FA96A0203FD0}.Release SingleThread.ActiveCfg = Release SingleThread|Win32 {238AAC7B-E8AE-4BF3-8683-FA96A0203FD0}.Release SingleThread.Build.0 = Release SingleThread|Win32 + {C7D99E56-35A9-46F9-BD2B-726CD3150869}.All.ActiveCfg = Release CRTDLL|Win32 + {C7D99E56-35A9-46F9-BD2B-726CD3150869}.All.Build.0 = Release CRTDLL|Win32 {C7D99E56-35A9-46F9-BD2B-726CD3150869}.Debug.ActiveCfg = Debug CRTDLL|Win32 {C7D99E56-35A9-46F9-BD2B-726CD3150869}.Debug CRTDLL.ActiveCfg = Debug CRTDLL|Win32 {C7D99E56-35A9-46F9-BD2B-726CD3150869}.Debug CRTDLL.Build.0 = Debug CRTDLL|Win32 *************** *** 120,123 **** --- 137,142 ---- {C7D99E56-35A9-46F9-BD2B-726CD3150869}.Release SingleThread.ActiveCfg = Release CRTDLL|Win32 {C7D99E56-35A9-46F9-BD2B-726CD3150869}.Release SingleThread.Build.0 = Release CRTDLL|Win32 + {9CD013D7-2AE8-44A9-B2D6-9EBDAAA126AE}.All.ActiveCfg = Debug SingleThread|Win32 + {9CD013D7-2AE8-44A9-B2D6-9EBDAAA126AE}.All.Build.0 = Debug SingleThread|Win32 {9CD013D7-2AE8-44A9-B2D6-9EBDAAA126AE}.Debug.ActiveCfg = Debug|Win32 {9CD013D7-2AE8-44A9-B2D6-9EBDAAA126AE}.Debug.Build.0 = Debug|Win32 *************** *** 132,135 **** --- 151,156 ---- {9CD013D7-2AE8-44A9-B2D6-9EBDAAA126AE}.Release SingleThread.ActiveCfg = Release SingleThread|Win32 {9CD013D7-2AE8-44A9-B2D6-9EBDAAA126AE}.Release SingleThread.Build.0 = Release SingleThread|Win32 + {60CA9440-286D-4BF9-BC36-7FBA5E448655}.All.ActiveCfg = Debug CRTDLL|Win32 + {60CA9440-286D-4BF9-BC36-7FBA5E448655}.All.Build.0 = Debug CRTDLL|Win32 {60CA9440-286D-4BF9-BC36-7FBA5E448655}.Debug.ActiveCfg = Debug|Win32 {60CA9440-286D-4BF9-BC36-7FBA5E448655}.Debug.Build.0 = Debug|Win32 *************** *** 144,147 **** --- 165,182 ---- {60CA9440-286D-4BF9-BC36-7FBA5E448655}.Release SingleThread.ActiveCfg = Release SingleThread|Win32 {60CA9440-286D-4BF9-BC36-7FBA5E448655}.Release SingleThread.Build.0 = Release SingleThread|Win32 + {19C36A53-51F2-4951-9A38-CCF6A250814F}.All.ActiveCfg = All|Win32 + {19C36A53-51F2-4951-9A38-CCF6A250814F}.All.Build.0 = All|Win32 + {19C36A53-51F2-4951-9A38-CCF6A250814F}.Debug.ActiveCfg = All|Win32 + {19C36A53-51F2-4951-9A38-CCF6A250814F}.Debug.Build.0 = All|Win32 + {19C36A53-51F2-4951-9A38-CCF6A250814F}.Debug CRTDLL.ActiveCfg = All|Win32 + {19C36A53-51F2-4951-9A38-CCF6A250814F}.Debug CRTDLL.Build.0 = All|Win32 + {19C36A53-51F2-4951-9A38-CCF6A250814F}.Debug SingleThread.ActiveCfg = All|Win32 + {19C36A53-51F2-4951-9A38-CCF6A250814F}.Debug SingleThread.Build.0 = All|Win32 + {19C36A53-51F2-4951-9A38-CCF6A250814F}.Release.ActiveCfg = All|Win32 + {19C36A53-51F2-4951-9A38-CCF6A250814F}.Release.Build.0 = All|Win32 + {19C36A53-51F2-4951-9A38-CCF6A250814F}.Release CRTDLL.ActiveCfg = All|Win32 + {19C36A53-51F2-4951-9A38-CCF6A250814F}.Release CRTDLL.Build.0 = All|Win32 + {19C36A53-51F2-4951-9A38-CCF6A250814F}.Release SingleThread.ActiveCfg = All|Win32 + {19C36A53-51F2-4951-9A38-CCF6A250814F}.Release SingleThread.Build.0 = All|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution |
|
From: Marco B. <mar...@us...> - 2006-06-08 14:52:17
|
Update of /cvsroot/objecthandler/ObjectHandler/gensrc In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9697/gensrc Modified Files: gensrc.vcproj Log Message: update VC7 workspaces Index: gensrc.vcproj =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/gensrc/gensrc.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gensrc.vcproj 6 Jun 2006 09:08:27 -0000 1.1 --- gensrc.vcproj 8 Jun 2006 14:52:11 -0000 1.2 *************** *** 27,34 **** <Files> <Filter ! Name="scripts" Filter=""> <File ! RelativePath="scripts\gensrc.py"> </File> </Filter> --- 27,37 ---- <Files> <Filter ! Name="config" Filter=""> <File ! RelativePath="config\config.xml"> ! </File> ! <File ! RelativePath="config\excel.xml"> </File> </Filter> *************** *** 37,107 **** Filter=""> <File ! RelativePath="metadata\calendar.xml"> ! </File> ! <File ! RelativePath="metadata\capfloor.xml"> ! </File> ! <File ! RelativePath="metadata\config.xml"> ! </File> ! <File ! RelativePath="metadata\couponvectors.xml"> ! </File> ! <File ! RelativePath="metadata\date.xml"> ! </File> ! <File ! RelativePath="metadata\daycounter.xml"> ! </File> ! <File ! RelativePath="metadata\enumerations.xml"> ! </File> ! <File ! RelativePath="metadata\exercise.xml"> ! </File> ! <File ! RelativePath="metadata\instruments.xml"> ! </File> ! <File ! RelativePath="metadata\interpolation.xml"> ! </File> ! <File ! RelativePath="metadata\mathf.xml"> ! </File> ! <File ! RelativePath="metadata\options.xml"> ! </File> ! <File ! RelativePath="metadata\prices.xml"> ! </File> ! <File ! RelativePath="metadata\processes.xml"> ! </File> ! <File ! RelativePath="metadata\randomsequencegenerator.xml"> ! </File> ! <File ! RelativePath="metadata\schedule.xml"> ! </File> ! <File ! RelativePath="metadata\shortratemodels.xml"> </File> <File ! RelativePath="metadata\simpleswap.xml"> </File> <File ! RelativePath="metadata\swap.xml"> </File> <File ! RelativePath="metadata\termstructures.xml"> </File> <File ! RelativePath="metadata\utilities.xml"> </File> <File ! RelativePath="metadata\volatilities.xml"> </File> <File ! RelativePath="metadata\xibor.xml"> </File> </Filter> --- 40,70 ---- Filter=""> <File ! RelativePath="metadata\functions.xml"> </File> + </Filter> + <Filter + Name="scripts" + Filter=""> <File ! RelativePath="scripts\gensrc.py"> </File> + </Filter> + <Filter + Name="stubs" + Filter=""> <File ! RelativePath="stubs\stub.copyright"> </File> <File ! RelativePath="stubs\stub.excel.exports"> </File> <File ! RelativePath="stubs\stub.excel.includes"> </File> <File ! RelativePath="stubs\stub.excel.register"> </File> <File ! RelativePath="stubs\stub.excel.unregister"> </File> </Filter> |
|
From: Eric E. <eri...@us...> - 2006-06-08 11:33:45
|
Update of /cvsroot/objecthandler/ObjectHandler/ohxl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13394/ohxl Modified Files: conversions.hpp Log Message: functions which loop on input parameter - match dimensions of return value with that of loop parameter Index: conversions.hpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/conversions.hpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** conversions.hpp 8 Jun 2006 09:37:27 -0000 1.5 --- conversions.hpp 8 Jun 2006 11:33:38 -0000 1.6 *************** *** 50,54 **** return; } ! xVector.xltype = xltypeMulti | xlbitDLLFree; if (FunctionCall::instance().getCallerDimensions() == Row) { xVector.val.array.columns = v.size(); --- 50,54 ---- return; } ! if (FunctionCall::instance().getCallerDimensions() == Row) { xVector.val.array.columns = v.size(); *************** *** 61,64 **** --- 61,93 ---- if (!xVector.val.array.lparray) throw Exception("vectorToXloper: error on call to new"); + xVector.xltype = xltypeMulti | xlbitDLLFree; + for (unsigned int i=0; i<v.size(); i++) + scalarToXloper(xVector.val.array.lparray[i], v[i]); + } + + template < class T > + void vectorToXloper(XLOPER &xVector, const std::vector < T > &v, const XLOPER *xInput) { + // set xVector with contents of v and dimensions of xInput + + if (v.empty()) { + //xVector.xltype = xltypeNum; + //xVector.val.num = 0; + xVector.xltype = xltypeErr; + xVector.val.err = xlerrNA; + return; + } + if (!xInput || xInput->xltype != xltypeMulti) + throw Exception("vectorToXloper: input parameter is not an array"); + + xVector.val.array.columns = xInput->val.array.columns; + xVector.val.array.rows = xInput->val.array.rows; + int inputSize = xVector.val.array.columns * xVector.val.array.rows; + if (inputSize != v.size()) + throw Exception("vectorToXloper: input array dimensions incompatible with data"); + xVector.val.array.lparray = new XLOPER[inputSize]; + if (!xVector.val.array.lparray) + throw Exception("vectorToXloper: error on call to new"); + xVector.xltype = xltypeMulti | xlbitDLLFree; + for (unsigned int i=0; i<v.size(); i++) scalarToXloper(xVector.val.array.lparray[i], v[i]); *************** *** 74,78 **** return; } - xMatrix.xltype = xltypeMulti | xlbitDLLFree; xMatrix.val.array.rows = vv.size(); xMatrix.val.array.columns = vv[0].size(); --- 103,106 ---- *************** *** 80,83 **** --- 108,112 ---- if (!xMatrix.val.array.lparray) throw Exception("matrixToXloper: error on call to new"); + xMatrix.xltype = xltypeMulti | xlbitDLLFree; for (unsigned int i=0; i<vv.size(); i++) { std::vector < T > v = vv[i]; |
|
From: Eric E. <eri...@us...> - 2006-06-08 09:37:30
|
Update of /cvsroot/objecthandler/ObjectHandler/ohxl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28347/ohxl Modified Files: conversions.hpp functioncall.cpp functioncall.hpp Log Message: format vector according to dimensions of calling range Index: functioncall.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/functioncall.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** functioncall.cpp 6 Jun 2006 14:12:40 -0000 1.4 --- functioncall.cpp 8 Jun 2006 09:37:27 -0000 1.5 *************** *** 32,36 **** FunctionCall::FunctionCall(const std::string functionName) ! : functionName_(functionName) { if (instance_) throw Exception("Multiple attempts to initialize global FunctionCall object"); --- 32,36 ---- FunctionCall::FunctionCall(const std::string functionName) ! : functionName_(functionName), callerDimensions_(Uninitialized) { if (instance_) throw Exception("Multiple attempts to initialize global FunctionCall object"); *************** *** 140,142 **** --- 140,160 ---- } + CallerDimensions FunctionCall::getCallerDimensions() { + // determine dimensions of calling range + // at present we're only interested in row vs column + // this could be extended to detect scalar / matrix + if (callerDimensions_ == Uninitialized) { + const XLOPER *xRef = getCallerReference(); + // xRef might be xltypeRef/xltypeSRef so coerce it to xltypeMulti + XLOPER xMulti; + Excel(xlCoerce, &xMulti, 2, xRef, TempInt(xltypeMulti)); + if (xMulti.val.array.rows == 1 && xMulti.val.array.columns > 1) + callerDimensions_ = Row; + else + callerDimensions_ = Column; + Excel(xlFree, 0, 1, &xMulti); + } + return callerDimensions_; + } + } Index: functioncall.hpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/functioncall.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** functioncall.hpp 1 Jun 2006 10:52:08 -0000 1.2 --- functioncall.hpp 8 Jun 2006 09:37:27 -0000 1.3 *************** *** 30,33 **** --- 30,35 ---- namespace ObjHandler { + enum CallerDimensions { Uninitialized, Row, Column, /* Matrix, Scalar */ }; + //! Singleton encapsulating state relating to Excel function call. /*! An instance of this object is instantiated on the heap when the *************** *** 46,49 **** --- 48,52 ---- const std::string &getFormula(); bool outerFunction(); + CallerDimensions getCallerDimensions(); private: static FunctionCall *instance_; *************** *** 53,56 **** --- 56,60 ---- std::string formula_; std::string functionName_; + CallerDimensions callerDimensions_; }; Index: conversions.hpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/conversions.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** conversions.hpp 1 Jun 2006 13:59:47 -0000 1.4 --- conversions.hpp 8 Jun 2006 09:37:27 -0000 1.5 *************** *** 21,24 **** --- 21,25 ---- #include <oh/objhandlerdefines.hpp> #include <xlsdk/xlsdkdefines.hpp> + #include <ohxl/functioncall.hpp> #include <vector> #include <string> *************** *** 50,55 **** } xVector.xltype = xltypeMulti | xlbitDLLFree; ! xVector.val.array.rows = v.size(); ! xVector.val.array.columns = 1; xVector.val.array.lparray = new XLOPER[v.size()]; if (!xVector.val.array.lparray) --- 51,61 ---- } xVector.xltype = xltypeMulti | xlbitDLLFree; ! if (FunctionCall::instance().getCallerDimensions() == Row) { ! xVector.val.array.columns = v.size(); ! xVector.val.array.rows = 1; ! } else { ! xVector.val.array.rows = v.size(); ! xVector.val.array.columns = 1; ! } xVector.val.array.lparray = new XLOPER[v.size()]; if (!xVector.val.array.lparray) |
|
From: Eric E. <eri...@us...> - 2006-06-07 22:15:45
|
Update of /cvsroot/objecthandler/ObjectHandler/Examples/xl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14253/Examples/xl Modified Files: addindynamic1.cpp addindynamic2.cpp addinstatic.cpp Log Message: autogenerate ObjectHandler code Index: addindynamic1.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/addindynamic1.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** addindynamic1.cpp 1 Jun 2006 16:56:25 -0000 1.5 --- addindynamic1.cpp 6 Jun 2006 09:08:26 -0000 1.6 *************** *** 20,23 **** --- 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 *************** *** 70,74 **** --- 71,78 ---- long *accountNumber, char *accountType) { + boost::shared_ptr < ObjHandler::FunctionCall > functionCall; try { + functionCall = boost::shared_ptr < ObjHandler::FunctionCall > + ( new ObjHandler::FunctionCall("addin1CreateAccount") ); ObjHandler::obj_ptr objectPointer(new AccountObject( *accountNumber, *************** *** 82,86 **** return ret; } catch (const std::exception &e) { ! ObjHandler::logMessage(std::string("Error: addin1CreateAccount: ") + e.what(), 2); return 0; } --- 86,94 ---- return ret; } catch (const std::exception &e) { ! std::ostringstream err; ! err << "Error: addin1CreateAccount - "; ! if (functionCall) err << functionCall->getAddressString() << " - "; ! err << e.what(); ! ObjHandler::logMessage(err.str(), 2); return 0; } *************** *** 88,92 **** --- 96,103 ---- DLLEXPORT short int *addin1SetBalance(char *instanceName, long *balance) { + boost::shared_ptr < ObjHandler::FunctionCall > functionCall; try { + functionCall = boost::shared_ptr < ObjHandler::FunctionCall > + ( new ObjHandler::FunctionCall("addin1SetBalance") ); OH_GET_OBJECT(accountObject, instanceName, AccountObject) accountObject->setBalance(*balance); *************** *** 94,98 **** return &ret; } catch (const std::exception &e) { ! ObjHandler::logMessage(std::string("Error: addin1SetBalance: ") + e.what(), 2); return 0; } --- 105,113 ---- return &ret; } catch (const std::exception &e) { ! std::ostringstream err; ! err << "Error: addin1SetBalance - "; ! if (functionCall) err << functionCall->getAddressString() << " - "; ! err << e.what(); ! ObjHandler::logMessage(err.str(), 2); return 0; } Index: addinstatic.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/addinstatic.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** addinstatic.cpp 1 Jun 2006 14:06:54 -0000 1.5 --- addinstatic.cpp 6 Jun 2006 09:08:26 -0000 1.6 *************** *** 21,24 **** --- 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, *************** *** 81,85 **** --- 82,89 ---- long *accountNumber, char *accountType) { + boost::shared_ptr < ObjHandler::FunctionCall > functionCall; try { + functionCall = boost::shared_ptr < ObjHandler::FunctionCall > + ( new ObjHandler::FunctionCall("createAccount") ); ObjHandler::obj_ptr objectPointer(new AccountObject( *accountNumber, *************** *** 93,97 **** return ret; } catch (const std::exception &e) { ! ObjHandler::logMessage(std::string("Error: createAccount: ") + e.what(), 2); return 0; } --- 97,105 ---- return ret; } catch (const std::exception &e) { ! std::ostringstream err; ! err << "Error: createAccount - "; ! if (functionCall) err << functionCall->getAddressString() << " - "; ! err << e.what(); ! ObjHandler::logMessage(err.str(), 2); return 0; } *************** *** 99,103 **** --- 107,114 ---- DLLEXPORT short int *setBalance(char *instanceName, long *balance) { + boost::shared_ptr < ObjHandler::FunctionCall > functionCall; try { + functionCall = boost::shared_ptr < ObjHandler::FunctionCall > + ( new ObjHandler::FunctionCall("createAccount") ); OH_GET_OBJECT(accountObject, instanceName, AccountObject) accountObject->setBalance(*balance); *************** *** 105,109 **** return &ret; } catch (const std::exception &e) { ! ObjHandler::logMessage(std::string("Error: setBalance: ") + e.what(), 2); return 0; } --- 116,124 ---- return &ret; } catch (const std::exception &e) { ! std::ostringstream err; ! err << "Error: setBalance - "; ! if (functionCall) err << functionCall->getAddressString() << " - "; ! err << e.what(); ! ObjHandler::logMessage(err.str(), 2); return 0; } *************** *** 111,115 **** --- 126,133 ---- DLLEXPORT long *getBalance(char *instanceName, OPER *trigger) { + boost::shared_ptr < ObjHandler::FunctionCall > functionCall; try { + functionCall = boost::shared_ptr < ObjHandler::FunctionCall > + ( new ObjHandler::FunctionCall("createAccount") ); OH_GET_OBJECT(accountObject, instanceName, AccountObject) static long ret; *************** *** 117,121 **** return &ret; } catch (const std::exception &e) { ! ObjHandler::logMessage(std::string("Error: getBalance: ") + e.what(), 2); return 0; } --- 135,143 ---- return &ret; } catch (const std::exception &e) { ! std::ostringstream err; ! err << "Error: getBalance - "; ! if (functionCall) err << functionCall->getAddressString() << " - "; ! err << e.what(); ! ObjHandler::logMessage(err.str(), 2); return 0; } Index: addindynamic2.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Examples/xl/addindynamic2.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** addindynamic2.cpp 1 Jun 2006 16:56:25 -0000 1.4 --- addindynamic2.cpp 6 Jun 2006 09:08:26 -0000 1.5 *************** *** 20,23 **** --- 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 *************** *** 59,63 **** --- 60,67 ---- DLLEXPORT long *addin2GetBalance(char *instanceName, OPER *trigger) { + boost::shared_ptr < ObjHandler::FunctionCall > functionCall; try { + functionCall = boost::shared_ptr < ObjHandler::FunctionCall > + ( new ObjHandler::FunctionCall("addin2GetBalance") ); OH_GET_OBJECT(accountObject, instanceName, AccountObject) static long ret; *************** *** 65,69 **** return &ret; } catch (const std::exception &e) { ! ObjHandler::logMessage(std::string("Error: getBalance: ") + e.what(), 2); return 0; } --- 69,77 ---- return &ret; } catch (const std::exception &e) { ! std::ostringstream err; ! err << "Error: addin2GetBalance - "; ! if (functionCall) err << functionCall->getAddressString() << " - "; ! err << e.what(); ! ObjHandler::logMessage(err.str(), 2); return 0; } |
|
From: Eric E. <eri...@us...> - 2006-06-07 22:15:45
|
Update of /cvsroot/objecthandler/ObjectHandler/gensrc/config In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14253/gensrc/config Added Files: config.xml excel.xml Log Message: autogenerate ObjectHandler code --- NEW FILE: config.xml --- <Config> <excelRootDirectory>../ohxl/</excelRootDirectory> <namespace>ObjHandler</namespace> <categoryNames> <categoryName>functions</categoryName> </categoryNames> </Config> --- NEW FILE: excel.xml --- <root> <AddinFiles> <AddinFile name='register.cpp'> <Buffer name='stub' fileName='stub.excel.register' local='true'/> </AddinFile> <AddinFile name='unregister.cpp'> <Buffer name='stub' fileName='stub.excel.unregister' local='true'/> </AddinFile> </AddinFiles> <exportSymbols>true</exportSymbols> <Buffer name='exportStub' fileName='stub.excel.exports' local='true'/> <implicitConversions/> </root> |
|
From: Eric E. <eri...@us...> - 2006-06-07 22:15:05
|
Update of /cvsroot/objecthandler/ObjectHandler/gensrc/stubs In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27231/stubs Log Message: Directory /cvsroot/objecthandler/ObjectHandler/gensrc/stubs added to the repository |
|
From: Eric E. <eri...@us...> - 2006-06-07 22:15:03
|
Update of /cvsroot/objecthandler/ObjectHandler/gensrc/metadata In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27231/metadata Log Message: Directory /cvsroot/objecthandler/ObjectHandler/gensrc/metadata added to the repository |
|
From: Eric E. <eri...@us...> - 2006-06-07 22:10:42
|
Update of /cvsroot/objecthandler/ObjectHandler/oh In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15652/oh Modified Files: object.hpp utilities.hpp Log Message: consolidate macros Index: object.hpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/oh/object.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** object.hpp 1 Jun 2006 13:59:47 -0000 1.3 --- object.hpp 6 Jun 2006 17:43:10 -0000 1.4 *************** *** 35,40 **** const CLASS& getObject() const { \ return *boost::dynamic_pointer_cast<CLASS>(POINTER); \ ! } \ ! // namespace ObjHandler { --- 35,65 ---- const CLASS& getObject() const { \ return *boost::dynamic_pointer_cast<CLASS>(POINTER); \ ! } ! ! //! 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()); \ ! } ! ! //! Object function getReference ! /*! 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 > \ ! ( NAME ## temp->getReference() ); namespace ObjHandler { Index: utilities.hpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/oh/utilities.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** utilities.hpp 6 Jun 2006 12:57:58 -0000 1.4 --- utilities.hpp 6 Jun 2006 17:43:13 -0000 1.5 *************** *** 26,55 **** #include <oh/objecthandler.hpp> - //! 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()); \ - } - - //! Object function getReference - /*! 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 > \ - ( NAME ## temp->getReference() ); - namespace ObjHandler { --- 26,29 ---- *************** *** 58,62 **** //! Retrieve ObjectHandler version string std::string version(); - /** \name ObjectHandler wrappers --- 32,35 ---- |
|
From: Eric E. <eri...@us...> - 2006-06-07 22:09:48
|
Update of /cvsroot/objecthandler/ObjectHandler/gensrc/scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14253/gensrc/scripts Added Files: gensrc.py Log Message: autogenerate ObjectHandler code --- NEW FILE: gensrc.py --- """ 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. """ import addinexcel import utilities import config config.Config.getInstance().initialize() addins = [] addins.append(utilities.serializeObject(addinexcel.AddinExcel)) utilities.generate(addins) |
