Changeset 1634 for code/branches/gcc43/src/asylum

Timestamp:

Jun 29, 2008, 7:36:33 PM (16 years ago)

Author:

nicolasc

Message:

just a test - don't morge this

Location:

code/branches/gcc43/src/asylum

Files:

• loader/LevelLoader.h (modified) (1 diff)
• util/String2Number.h (modified) (1 diff)
• util/Tokenizer.h (modified) (1 diff)

code/branches/gcc43/src/asylum/loader/LevelLoader.h

@@ -30 +30 @@
 
     // Getters
-    inline std::string name() {return name_; };
-    inline std::string description() {return description_; };
-    inline std::string image() {return image_; };
+    std::string name() {return name_; };
+    std::string description() {return description_; };
+    std::string image() {return image_; };
   private:
     //! Level information

code/branches/gcc43/src/asylum/util/String2Number.h

@@ -66 +66 @@
    * should be one of std::hex, std::dec or std::oct (dec is default value)
    */
-  inline String2Number(T& t, const std::string& s, std::ios_base& (*f)(std::ios_base&) =  std::dec, int haltOnError=1)
+  String2Number(T& t, const std::string& s, std::ios_base& (*f)(std::ios_base&) =  std::dec, int haltOnError=1)
   {
     std::istringstream iss(s);

code/branches/gcc43/src/asylum/util/Tokenizer.h

@@ -44 +44 @@
  */
 
-inline std::vector<std::string> tokenize(const std::string& str, const std::string& delimiters = ",")
+std::vector<std::string> tokenize(const std::string& str, const std::string& delimiters = ",")
 {
   std::vector<std::string> tokens;