[Corelinux-clcvs] CVS: clfw/clfw/LibLoad LibraryObjectDefinition.hpp,1.1,1.2 LibraryType.hpp,1.3,1.4

[Frank V. C. <fr...@us...>]

Update of /cvsroot/corelinux/clfw/clfw/LibLoad
In directory slayer.i.sourceforge.net:/tmp/cvs-serv27714/clfw/LibLoad

Modified Files:
	LibraryObjectDefinition.hpp LibraryType.hpp 
Log Message:
119678 Dispatch table for objects

Index: LibraryObjectDefinition.hpp
===================================================================
RCS file: /cvsroot/corelinux/clfw/clfw/LibLoad/LibraryObjectDefinition.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** LibraryObjectDefinition.hpp	2000/08/30 21:22:05	1.1
--- LibraryObjectDefinition.hpp	2000/10/29 17:09:52	1.2
***************
*** 22,29 ****
  */
  
! #if   !defined(__COMMON_HPP)
! #include <Common.hpp>
  #endif
  
  #include <string>
  
--- 22,33 ----
  */
  
! #if   !defined(__CLFWCOMMON_HPP)
! #include <ClfwCommon.hpp>
  #endif
  
+ #if   !defined(__AGGREGATE_HPP)
+ #include <clfw/Aggregate.hpp>
+ #endif
+ 
  #include <string>
  
***************
*** 42,47 ****
     DECLARE_CLASS( LibraryObjectDefinition );
  
!    class LibraryObjectDefinition 
     {
     public:
  
--- 46,53 ----
     DECLARE_CLASS( LibraryObjectDefinition );
  
!    class LibraryObjectDefinition : public Aggregate
     {
+       DECLARE_METATYPEMEMBERS( LibraryObjectDefinition );
+ 
     public:
  
***************
*** 50,53 ****
--- 56,63 ----
        //
  
+                         /// Default definition constructor 
+ 
+                         LibraryObjectDefinition( void ) ;
+ 
                          /**
                          Default constructor requires a library object
***************
*** 72,79 ****
                 bool operator==( LibraryObjectDefinitionCref ) const;
  
-                /// Name coercion operator
- 
-                operator const std::string &( void ) const;
- 
        //
        // Accessor
--- 82,85 ----
***************
*** 102,105 ****
--- 108,117 ----
        virtual  void  destroyIndividual( LibraryInstancePtr, LibraryObjectPtr )  = 0;
  
+       /** @name Data members for Meta access
+       */
+       //@{
+                DECLARE_INSTANCEDATA( string, DefinitionName );
+       //@}
+ 
     protected:
  
***************
*** 108,115 ****
        // Constructors
        //
-                         /// Default constructor not allowed
- 
-                         LibraryObjectDefinition( void ) throw ( Assertion );
- 
                          /// Copy constructor not allowed
  
--- 120,123 ----
***************
*** 124,130 ****
  
     private:
-                /// The defintion and library object name
- 
-                std::string    theDefinitionName;
  
     };
--- 132,135 ----

Index: LibraryType.hpp
===================================================================
RCS file: /cvsroot/corelinux/clfw/clfw/LibLoad/LibraryType.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** LibraryType.hpp	2000/10/25 22:31:22	1.3
--- LibraryType.hpp	2000/10/29 17:09:52	1.4
***************
*** 27,31 ****
  
  #if   !defined(__AGGREGATE_HPP)
! #include <Aggregate.hpp>
  #endif
  
--- 27,31 ----
  
  #if   !defined(__AGGREGATE_HPP)
! #include <clfw/Aggregate.hpp>
  #endif