Changeset 7221 in orxonox.OLD for trunk/src/util/fast_factory.h

Timestamp:

Mar 15, 2006, 3:10:45 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

File:

• trunk/src/util/fast_factory.h (modified) (4 diffs)

trunk/src/util/fast_factory.h

@@ -80 +80 @@
 
     static FastFactory* searchFastFactory(ClassID classID);
-    static FastFactory* searchFastFactory(const char* fastFactoryName);
+    static FastFactory* searchFastFactory(const std::string& fastFactoryName);
 
     ClassID getStoredID() const { return this->storedClassID; };
 
   protected:
-    FastFactory (ClassID classID, const char* fastFactoryName = NULL);
+    FastFactory (ClassID classID, const std::string& fastFactoryName = "");
 
     /** sets the Next factory in the list @param nextFactory the next factory */
@@ -121 +121 @@
   {
   public:
-    static tFastFactory<T>* getFastFactory(ClassID classID, const char* fastFactoryName = NULL);
+    static tFastFactory<T>* getFastFactory(ClassID classID, const std::string& fastFactoryName = NULL);
 
   private:
-    tFastFactory(ClassID classID, const char* fastFactoryName);
+    tFastFactory(ClassID classID, const std::string& fastFactoryName);
 
     virtual void fabricate();
@@ -136 +136 @@
  */
 template<class T>
-tFastFactory<T>::tFastFactory(ClassID classID, const char* fastFactoryName)
+tFastFactory<T>::tFastFactory(ClassID classID, const std::string& fastFactoryName)
     : FastFactory(classID, fastFactoryName)
 {}
@@ -147 +147 @@
  */
 template<class T>
-tFastFactory<T>* tFastFactory<T>::getFastFactory(ClassID classID, const char* fastFactoryName)
+    tFastFactory<T>* tFastFactory<T>::getFastFactory(ClassID classID, const std::string& fastFactoryName)
 {
   tFastFactory<T>* tmpFac = NULL;