Menu
▾
▴
[Corelinux-clcvs] CVS: clfw/clfw/LibLoad LibraryInstance.hpp,1.1,1.2 LibraryLoad.hpp,1.3,1.4 LibraryObject.hpp,1.1,1.2 LibraryObjectRegistry.hpp,1.2,1.3 Makefile.am,1.2,1.3 LibraryObjectDefinition.hpp,1.3,NONE
|
From: Frank V. C. <fr...@us...> - 2000-11-19 03:18:31
|
Update of /cvsroot/corelinux/clfw/clfw/LibLoad In directory slayer.i.sourceforge.net:/tmp/cvs-serv20361/clfw/LibLoad Modified Files: LibraryInstance.hpp LibraryLoad.hpp LibraryObject.hpp LibraryObjectRegistry.hpp Makefile.am Removed Files: LibraryObjectDefinition.hpp Log Message: 122753 Refit LibraryLoad Index: LibraryInstance.hpp =================================================================== RCS file: /cvsroot/corelinux/clfw/clfw/LibLoad/LibraryInstance.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** LibraryInstance.hpp 2000/08/30 21:22:05 1.1 --- LibraryInstance.hpp 2000/11/19 03:18:28 1.2 *************** *** 22,31 **** */ ! #if !defined(__COMMON_HPP) ! #include <Common.hpp> #endif - #include <string> - namespace corelinux { --- 22,29 ---- */ ! #if !defined(__CLFWCOMMON_HPP) ! #include <ClfwCommon.hpp> #endif namespace corelinux { *************** *** 52,60 **** LibraryInstances are typically constructed by the Loader with the name of the library. ! @param std::string for library name @exception NullPointerException the empty string. */ ! LibraryInstance( const std::string & ) throw ( NullPointerException ); --- 50,58 ---- LibraryInstances are typically constructed by the Loader with the name of the library. ! @param CharCptr for library name @exception NullPointerException the empty string. */ ! LibraryInstance( CharCptr ) throw ( NullPointerException ); *************** *** 71,78 **** bool operator==( LibraryInstanceCref ) const; - /// Coercion operator for name - - operator const std::string &( void ) const; - // // Accessors --- 69,72 ---- *************** *** 81,85 **** /// Fetch the library name ! const std::string & getLibraryName( void ) const; // --- 75,79 ---- /// Fetch the library name ! CharCptr getLibraryName( void ) const; // *************** *** 94,98 **** Retrieves a LibraryObject instance from the LibraryInstance. ! @param std::string to the name of the object @return The instance of the LibraryObject @exception NullPointerException if the name is --- 88,92 ---- Retrieves a LibraryObject instance from the LibraryInstance. ! @param CharCptr to the name of the object @return The instance of the LibraryObject @exception NullPointerException if the name is *************** *** 100,104 **** */ ! virtual LibraryObjectPtr getObject( const std::string & ) throw ( NullPointerException )= 0; --- 94,98 ---- */ ! virtual LibraryObjectPtr getObject( CharCptr ) throw ( NullPointerException )= 0; *************** *** 119,128 **** resolve the library object from the Registry. Calls LibraryObjectRegistry::createObject ! @param std::string to the name of the object @exception NullPointerException if the name is the empty string */ ! LibraryObjectPtr getLibraryObject( const std::string & ) throw ( NullPointerException ); --- 113,122 ---- resolve the library object from the Registry. Calls LibraryObjectRegistry::createObject ! @param CharCptr to the name of the object @exception NullPointerException if the name is the empty string */ ! LibraryObjectPtr getLibraryObject( CharCptr ) throw ( NullPointerException ); *************** *** 159,163 **** /// The library name key ! std::string theLibraryName; }; --- 153,157 ---- /// The library name key ! CharPtr theLibraryName; }; Index: LibraryLoad.hpp =================================================================== RCS file: /cvsroot/corelinux/clfw/clfw/LibLoad/LibraryLoad.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** LibraryLoad.hpp 2000/11/18 22:43:13 1.3 --- LibraryLoad.hpp 2000/11/19 03:18:28 1.4 *************** *** 40,44 **** #define INCL_LibraryInstance <clfw/LibLoad/LibraryInstance.hpp> #define INCL_LibraryObject <clfw/LibLoad/LibraryObject.hpp> - #define INCL_LibraryObjectDefinition <clfw/LibLoad/LibraryObjectDefinition.hpp> #define INCL_LibraryObjectRegistry <clfw/LibLoad/LibraryObjectRegistry.hpp> --- 40,43 ---- Index: LibraryObject.hpp =================================================================== RCS file: /cvsroot/corelinux/clfw/clfw/LibLoad/LibraryObject.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** LibraryObject.hpp 2000/08/30 21:22:05 1.1 --- LibraryObject.hpp 2000/11/19 03:18:28 1.2 *************** *** 22,29 **** */ ! #if !defined(__COMMON_HPP) ! #include <Common.hpp> #endif namespace corelinux { --- 22,33 ---- */ ! #if !defined(__CLFWCOMMON_HPP) ! #include <ClfwCommon.hpp> #endif + #if !defined(__AGGREGATE_HPP) + #include <clfw/Aggregate.hpp> + #endif + namespace corelinux { *************** *** 34,40 **** */ ! class LibraryObject { public: --- 38,46 ---- */ ! class LibraryObject : public Aggregate { + DECLARE_METATYPEMEMBERS( LibraryObject ); + public: *************** *** 44,52 **** /// Default requires a name ! LibraryObject( const std::string & ); - /// Copy constructor - - LibraryObject( LibraryObjectCref ); /// Virtual destructor --- 50,55 ---- /// Default requires a name ! LibraryObject( void ); /// Virtual destructor *************** *** 65,72 **** // Accessors // - /// Access library object name - const std::string & getName( void ) const; - // // Mutators --- 68,72 ---- *************** *** 74,84 **** protected: - - // - // Constructor - // - /// Default constructor not reached ! LibraryObject( void ) throw ( Assertion ); // --- 74,81 ---- protected: ! /// Copy constructor ! ! LibraryObject( LibraryObjectCref ); // *************** *** 94,98 **** private: - const std::string & theName; }; } --- 91,94 ---- Index: LibraryObjectRegistry.hpp =================================================================== RCS file: /cvsroot/corelinux/clfw/clfw/LibLoad/LibraryObjectRegistry.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** LibraryObjectRegistry.hpp 2000/08/31 23:12:42 1.2 --- LibraryObjectRegistry.hpp 2000/11/19 03:18:28 1.3 *************** *** 22,42 **** */ ! #if !defined(__COMMON_HPP) ! #include <Common.hpp> ! #endif ! #if !defined(__SINGLETON_HPP) ! #include <Singleton.hpp> #endif ! #if !defined(__SET_HPP) ! #include <Set.hpp> #endif #if !defined(__MAP_HPP) ! #include <Map.hpp> #endif - #include <string> namespace corelinux --- 22,39 ---- */ ! #define LIBRARY_LOAD_FRAMWORK ! #if !defined(__CLFWCOMMON_HPP) ! #include <ClfwCommon.hpp> #endif ! #if !defined(__SINGLETON_HPP) ! #include <corelinux/Singleton.hpp> #endif #if !defined(__MAP_HPP) ! #include <corelinux/Map.hpp> #endif namespace corelinux *************** *** 46,69 **** // - DECLARE_CLASS( LibraryObject ); DECLARE_CLASS( LibraryInstance ); ! DECLARE_CLASS( LibraryObjectDefinition ); ! CORELINUX_MAP ! ( ! std::string, ! LibraryObjectDefinitionPtr, ! less<std::string>, ! ObjectDefinitions ! ); CORELINUX_MAP ( ! std::string, ! ObjectDefinitions, ! less<std::string>, ! DefinitionMap ! ); /** --- 43,64 ---- // DECLARE_CLASS( LibraryInstance ); ! DECLARE_CLASS( LibraryObject ); ! struct __LibObjectReference ! { ! LibraryObjectPtr theLibObj; ! Count theCount; ! }; ! DECLARE_TYPE( struct __LibObjectReference, LibObjectReference ); CORELINUX_MAP ( ! LibraryInstancePtr, ! LibObjectReference, ! less<LibraryInstancePtr>, ! ObjectInstanceMap ! ); /** *************** *** 104,111 **** @param LibraryInstance pointer to library instance. This is passed to the LibraryObjectDefinition if found. ! @param std::string reference to the name of the LibraryObject ! being resolved. @exception NullPointerException if instance pointer is null, ! or definition name is empty @return LibraryObject pointer. */ --- 99,105 ---- @param LibraryInstance pointer to library instance. This is passed to the LibraryObjectDefinition if found. ! @param CharCptr to the name of the LibraryObject being resolved. @exception NullPointerException if instance pointer is null, ! or definition name is null @return LibraryObject pointer. */ *************** *** 114,118 **** ( LibraryInstancePtr, ! const std::string & ) throw ( NullPointerException ); --- 108,112 ---- ( LibraryInstancePtr, ! CharCptr ) throw ( NullPointerException ); *************** *** 132,216 **** throw ( NullPointerException ); - // - // Registry methods - // - - /** - Registers a LibraryObjectDefinition prototype for the library - name - @param std::string reference to the library name - @param LibraryObjectDefinition instance - @exception NullPointerException if the LibraryObjectDefinition - is null, or if library name is empty string. - */ - - static void registerObjectDefinition - ( - const std::string &, - LibraryObjectDefinitionPtr - ) - throw ( NullPointerException ); - - /** - Registers a LibraryObjectDefinition prototype for the library - name - @param std::string reference to the library name - @param ObjectDefinitions collection of - LibraryObjectDefinition instances - @exception NullPointerException if the set is empty, - or if library name is empty string. - */ - - static void registerObjectDefinition - ( - const std::string &, - ObjectDefinitionsCref - ) - throw ( NullPointerException ); - - /** - Removes a LibraryObjectDefinition prototype from the library - name - @param std::string reference to the library name - @param LibraryObjectDefinition instance - @exception NullPointerException if the LibraryObjectDefinition - is null, or if library name is empty string. - */ - - static void deregisterObjectDefinition - ( - const std::string &, - LibraryObjectDefinitionPtr - ) - throw ( NullPointerException ); - - /** - Removes a collection of LibraryObjectDefinition from the - library name - @param std::string reference to the library name - @param ObjectDefinitions collection of LibraryObjectDefinition - instances - @exception NullPointerException if the set is empty, - or if library name is empty string. - */ - static void deregisterObjectDefinition - ( - const std::string &, - ObjectDefinitionsCref - ) - throw ( NullPointerException ); - - /** - Remove all the object defitions for a specific library - @param std::string reference to the library name - @exception NullPointerException if name is empty string - */ - - static void deregisterObjectDefinition( const std::string & ) - throw ( NullPointerException ); - - - protected: /// Copy constructor not allowed --- 126,130 ---- *************** *** 225,257 **** /// Return true if name is already a key ! bool isLibraryDefined( const std::string & ) const; - /// Return the definition associated to the library name - LibraryObjectDefinitionPtr getDefinition - ( - const std::string &, - const std::string & - ); - // // Mutators // - /// Add a definition object to the library map - - void addDefinition - ( - const std::string & , - ObjectDefinitionsCref - ); - - /// Add a definition object to the library map - - void removeDefinition - ( - const std::string & aLibraryName, - ObjectDefinitionsCptr aMap = NULLPTR - ); protected: --- 139,149 ---- /// Return true if name is already a key ! bool isLibraryDefined( CharCptr ) const; // // Mutators // protected: *************** *** 262,268 **** private: ! /// The map of libraries to their object definitions ! DefinitionMap theDefinitions; }; --- 154,160 ---- private: ! /// The map of libraries to their objects ! ObjectInstanceMap theInstances; }; Index: Makefile.am =================================================================== RCS file: /cvsroot/corelinux/clfw/clfw/LibLoad/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Makefile.am 2000/09/05 01:21:33 1.2 --- Makefile.am 2000/11/19 03:18:28 1.3 *************** *** 6,10 **** # E-MAIL: fr...@us... # ORIG-DATE: 10-Apr-00 at 10:34:57 ! # LAST-MOD: 4-Sep-00 at 21:08:30 by Christophe Prud'homme # DESCRIPTION: # DESCRIP-END. --- 6,10 ---- # E-MAIL: fr...@us... # ORIG-DATE: 10-Apr-00 at 10:34:57 ! # LAST-MOD: $Id$ # DESCRIPTION: # DESCRIP-END. *************** *** 21,25 **** LibraryInstance.hpp \ LibraryObject.hpp \ - LibraryObjectDefinition.hpp \ LibraryObjectRegistry.hpp \ LibraryType.hpp --- 21,31 ---- LibraryInstance.hpp \ LibraryObject.hpp \ LibraryObjectRegistry.hpp \ LibraryType.hpp + + # Common rcs information do not modify + # $Author$ + # $Revision$ + # $Date$ + # $Locker$ + --- LibraryObjectDefinition.hpp DELETED --- |
