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

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

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

Modified Files:
	LibraryType.hpp Loader.hpp 
Log Message:
122753 Refit Library Load Abstraction

Index: LibraryType.hpp
===================================================================
RCS file: /cvsroot/corelinux/clfw/clfw/LibLoad/LibraryType.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** LibraryType.hpp	2000/10/29 17:09:52	1.4
--- LibraryType.hpp	2000/11/18 14:04:58	1.5
***************
*** 30,35 ****
  #endif
  
- #include <string>
- 
  namespace   corelinux
  {
--- 30,33 ----
***************
*** 37,42 ****
  
     /**
!    LibraryType enables identification of Loaders
!    based on type.
     */
  
--- 35,39 ----
  
     /**
!    LibraryType enables identification of Loaders based on type.
     */
  
***************
*** 71,78 ****
                 bool  operator==( LibraryTypeCref ) const;
  
-                /// Less than operator
- 
-                bool  operator<( LibraryTypeCref ) const;
-    
                 /// Assignment operator
     
--- 68,71 ----
***************
*** 83,91 ****
        //
  
-       /** @name Data members for Meta access
-       */
-       //@{
-                DECLARE_INSTANCEDATA( string, TypeName );
-       //@}
  
     protected:
--- 76,79 ----

Index: Loader.hpp
===================================================================
RCS file: /cvsroot/corelinux/clfw/clfw/LibLoad/Loader.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Loader.hpp	2000/08/31 02:18:51	1.2
--- Loader.hpp	2000/11/18 14:04:58	1.3
***************
*** 28,36 ****
  #endif
  
  #if   !defined(__LOADEXCEPTION_HPP)
  #include INCL_LoadException
  #endif
  
- #include <string>
  
  namespace   corelinux
--- 28,39 ----
  #endif
  
+ #if   !defined(__AGGREGATE_HPP)
+ #include <clfw/Aggregate.hpp>
+ #endif
+ 
  #if   !defined(__LOADEXCEPTION_HPP)
  #include INCL_LoadException
  #endif
  
  
  namespace   corelinux
***************
*** 44,49 ****
     */
  
!    class Loader
     {
     public:
  
--- 47,54 ----
     */
  
!    class Loader : public Aggregate
     {
+       DECLARE_METATYPEMEMBERS( Loader );
+ 
     public:
  
***************
*** 53,62 ****
  
                             /**
!                            Default constructor, takes an optional
!                            name binding
!                            @param Char pointer to or null
                             */
     
!                            Loader( const std::string & aName = "" );
  
                             /// Virtual Destructor
--- 58,65 ----
  
                             /**
!                            Default constructor
                             */
     
!                            Loader( void );
  
                             /// Virtual Destructor
***************
*** 76,83 ****
        //
  
-                /// Returns name assigned to loader
- 
-                const std::string & getLoaderName( void ) const;
- 
        //
        // Load routines
--- 79,82 ----
***************
*** 85,89 ****
                 /**
                 Load is the request to access the identified library
!                @param std::string for name of library
                 @return LibraryInstance instance of LibraryInstance
                 @exception CantLoadException if for some reason the library
--- 84,88 ----
                 /**
                 Load is the request to access the identified library
!                @param CharPtr for name of library
                 @return LibraryInstance instance of LibraryInstance
                 @exception CantLoadException if for some reason the library
***************
*** 91,95 ****
                 */
  
!       virtual  LibraryInstancePtr   load( const std::string & ) throw ( LoadException ) = 0;
  
  
--- 90,94 ----
                 */
  
!       virtual  LibraryInstancePtr   load( CharPtr ) throw ( LoadException ) = 0;
  
  
***************
*** 108,114 ****
     private:
  
-             /// Name, if supplied
- 
-             std::string    theLoaderName;
     };
  }
--- 107,110 ----