[Corelinux-clcvs] CVS: clfll/clfll FunctionLibraryInstance.hpp,NONE,1.1 FunctionLibraryObject.hpp,NONE,1.1 FunctionLoader.hpp,1.1,1.2 Makefile.am,1.2,1.3

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

Update of /cvsroot/corelinux/clfll/clfll
In directory slayer.i.sourceforge.net:/tmp/cvs-serv13808/clfll

Modified Files:
	FunctionLoader.hpp Makefile.am 
Added Files:
	FunctionLibraryInstance.hpp FunctionLibraryObject.hpp 
Log Message:
122702 - Needs latest CVS clfw

***** Error reading new file: (2, 'No such file or directory')
***** Error reading new file: (2, 'No such file or directory')
Index: FunctionLoader.hpp
===================================================================
RCS file: /cvsroot/corelinux/clfll/clfll/FunctionLoader.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** FunctionLoader.hpp	2000/11/18 22:45:22	1.1
--- FunctionLoader.hpp	2000/11/20 05:26:35	1.2
***************
*** 34,40 ****
--- 34,56 ----
  #endif
  
+ #if   !defined(__MAP_HPP)
+ #include <corelinux/Map.hpp>
+ #endif
  
+ #include <cstring>
+ 
  namespace   corelinux
  {
+ 
+    struct KeyComp
+    {
+       bool operator()(CharCptr s1, CharCptr s2) const
+       {
+          return strcmp(s1, s2) < 0;
+       }
+    };
+ 
+    CORELINUX_MAP( CharCptr, LibraryInstancePtr, KeyComp, InstanceMap );
+ 
     DECLARE_CLASS( FunctionLoader );
  
***************
*** 89,93 ****
        virtual  LibraryInstancePtr   load( CharPtr ) throw ( LoadException );
  
- 
     protected:
  
--- 105,108 ----
***************
*** 103,106 ****
--- 118,123 ----
  
     private:
+ 
+       static   InstanceMap    theInstances;
  
     };

Index: Makefile.am
===================================================================
RCS file: /cvsroot/corelinux/clfll/clfll/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.am	2000/11/18 22:45:22	1.2
--- Makefile.am	2000/11/20 05:26:35	1.3
***************
*** 13,19 ****
  
  include_HEADERS	= ClfllCommon.hpp 	\
! 	FunctionLoader.hpp	\
! 	FunctionLibraryType.hpp	\
!         Makefile.am 
  
  # Common rcs information do not modify
--- 13,21 ----
  
  include_HEADERS	= ClfllCommon.hpp 	\
! 	FunctionLoader.hpp			\
! 	FunctionLibraryType.hpp		\
! 	FunctionLibraryInstance.hpp	\
! 	FunctionLibraryObject.hpp	\
!     Makefile.am 
  
  # Common rcs information do not modify