[Corelinux-clcvs] CVS: clfw/src/libs/LibLoad LibraryObjectDefinition.cpp,1.2,1.3 LibraryType.cpp,1.4,1.5

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

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

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

Index: LibraryObjectDefinition.cpp
===================================================================
RCS file: /cvsroot/corelinux/clfw/src/libs/LibLoad/LibraryObjectDefinition.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** LibraryObjectDefinition.cpp	2000/08/31 02:18:51	1.2
--- LibraryObjectDefinition.cpp	2000/10/29 17:09:52	1.3
***************
*** 19,22 ****
--- 19,25 ----
  */
  
+ /*!  \file LibraryObjectDefinition.cpp
+ */
+ 
  #define LIBRARY_LOAD_FRAMWORK
  
***************
*** 31,53 ****
  namespace corelinux
  {
!    //
!    // Constructor
!    //
  
!    LibraryObjectDefinition::LibraryObjectDefinition( const std::string &aName )
!       throw ( NullPointerException )
!       :
!       theDefinitionName( aName )
!    {
!       if( theDefinitionName.empty() == true )
!       {
!          throw NullPointerException(LOCATION);
!       }
!       else
!       {
!          ;  // do nothing
!       }
!    }
  
     //
     // Default constructor
--- 34,72 ----
  namespace corelinux
  {
!    //! version LibraryType for the MetaType
  
!    const DwordCref   version(1);
! 
!    //! meta indentifier for the LibraryType
! 
!    const UniversalIdentifier  metaIdentifier
!       (
!          "0829af44-accb-11d4-8df6-00500489272c"
!       );
! 
!    //! ahh, our first foray into ontologies
! 
!    OPEN_METATYPE_PARENTS( LibraryObjectDefinition )
!    DEFINE_METATYPE_PARENT( Aggregate  )
!    CLOSE_METATYPE_PARENT;
! 
!    //! because this is a abstract base entity, there are no members either
! 
!    //! We define our property data descriptor
! 
!    DEFINE_INSTANCEDATA_DESCRIPTOR(LibraryObjectDefinition,string,DefinitionName);
!    
!    //! We construct the values reference
! 
!    OPEN_INSTANCEDATA( LibraryObjectDefinition )
!       DEFINE_INSTANCEDATA( LibraryObjectDefinition, DefinitionName )
!    CLOSE_INSTANCEDATA;
  
+    DEFINE_DUMMY_DISPATCHTABLE( LibraryObjectDefinition );
+ 
+    //! we use the abstract macro for MetaTypeAggregate autonaming
+ 
+    DEFINE_ABSTRACT_METATYPE( LibraryObjectDefinition, metaIdentifier, version );
+ 
     //
     // Default constructor
***************
*** 55,61 ****
  
     LibraryObjectDefinition::LibraryObjectDefinition( void )
!       throw ( Assertion )
     {
!       NEVER_GET_HERE;
     }
  
--- 74,81 ----
  
     LibraryObjectDefinition::LibraryObjectDefinition( void )
!       :
!       Aggregate()
     {
!       ; // do nothing
     }
  
***************
*** 69,72 ****
--- 89,94 ----
        )
        throw ( Assertion )
+       :
+       Aggregate()
     {
        NEVER_GET_HERE;
***************
*** 90,104 ****
           LibraryObjectDefinitionCref aObjectDefinition 
        ) const
-    {
-       return (theDefinitionName == (const std::string &)aObjectDefinition);
-    }
- 
-    //
-    // Coercion operator
-    //
- 
-    LibraryObjectDefinition::operator const std::string &( void ) const
     {
!       return theDefinitionName;
     }
  
--- 112,117 ----
           LibraryObjectDefinitionCref aObjectDefinition 
        ) const
     {
!       return ( this->getDefinitionName() == aObjectDefinition.getDefinitionName() );
     }
  

Index: LibraryType.cpp
===================================================================
RCS file: /cvsroot/corelinux/clfw/src/libs/LibLoad/LibraryType.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** LibraryType.cpp	2000/10/25 22:31:23	1.4
--- LibraryType.cpp	2000/10/29 17:09:52	1.5
***************
*** 19,22 ****
--- 19,25 ----
  */
  
+ /*!  \file LibraryType.cpp
+ */
+ 
  #define LIBRARY_LOAD_FRAMWORK
  
***************
*** 59,62 ****
--- 62,67 ----
        DEFINE_INSTANCEDATA( LibraryType, TypeName )
     CLOSE_INSTANCEDATA;
+ 
+    DEFINE_DUMMY_DISPATCHTABLE( LibraryType );
  
     //! we use the abstract macro for MetaTypeAggregate autonaming