[ObjectHandler-cvs] ObjectHandler/oh utilities.cpp, 1.3, 1.4 utilities.hpp, 1.3, 1.4

[Eric E. <eri...@us...>]

Update of /cvsroot/objecthandler/ObjectHandler/oh
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2067/oh

Modified Files:
	utilities.cpp utilities.hpp 
Log Message:
fix problem linking ObjectHandler XLL

Index: utilities.cpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/oh/utilities.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** utilities.cpp	6 Jun 2006 09:08:27 -0000	1.3
--- utilities.cpp	6 Jun 2006 12:57:57 -0000	1.4
***************
*** 27,30 ****
--- 27,34 ----
  namespace ObjHandler {
  
+     std::string version() {
+         return OBJHANDLER_VERSION;
+     }
+ 
      DLL_API std::string storeObject(
              const std::string &instanceName,
***************
*** 40,46 ****
      }
  
!     std::string version() {
!         return OBJHANDLER_VERSION;
      }
  
      std::string setLogFile(
--- 44,52 ----
      }
  
! #ifdef COMPILING_XLL
!     DLL_API void resetCaller() {
!         ObjectHandler::instance().resetCaller();
      }
+ #endif
  
      std::string setLogFile(

Index: utilities.hpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/oh/utilities.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** utilities.hpp	6 Jun 2006 09:08:27 -0000	1.3
--- utilities.hpp	6 Jun 2006 12:57:58 -0000	1.4
***************
*** 56,61 ****
      enum AnyError { InvalidInput, CaughtException };
  
      //! Store given Object in repository under given instance name.
!     /*! Any existing Objet with that instance name is deleted.
      */
      DLL_API std::string storeObject(
--- 56,73 ----
      enum AnyError { InvalidInput, CaughtException };
  
+     //! 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(
***************
*** 66,74 ****
      /*! Throws an exception if no Object exists with given instance name.
      */
!     DLL_API ObjHandler::obj_ptr retrieveObject(
              const std::string &instanceName);
  
!     //! Retrieve ObjectHandler version string
!     std::string version();
  
      /** \name Logging framework
--- 78,92 ----
      /*! 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