Changeset 1349 for code/trunk/src/util

Timestamp:

May 21, 2008, 9:07:08 PM (17 years ago)

Author:

rgrieder

Message:

• merged input branch back to trunk

Location:

code/trunk/src/util

Files:

• Math.h (modified) (1 diff)
• SubString.cc (modified) (1 diff)
• SubString.h (modified) (1 diff)

code/trunk/src/util/Math.h

@@ -147 +147 @@
 }
 
+class _UtilExport IntVector2
+{
+public:
+  IntVector2() : x(0), y(0) { }
+  IntVector2(int _x, int _y) : x(_x), y(_y) { }
+  int x;
+  int y;
+};
+
+class _UtilExport IntVector3
+{
+public:
+  IntVector3() : x(0), y(0), z(0) { }
+  IntVector3(int _x, int _y, int _z) : x(_x), y(_y), z(_z) { }
+  int x;
+  int y;
+  int z;
+};
+
 #endif /* _Util_Math_H__ */

code/trunk/src/util/SubString.cc

@@ -67 +67 @@
 SubString::SubString(const std::string& string,
                      const std::string& delimiters, const std::string& delimiterNeighbours, bool emptyEntries,
-                     char escapeChar, bool removeExcapeChar, char safemode_char, bool removeSafemodeChar,
+                     char escapeChar, bool removeEscapeChar, char safemode_char, bool removeSafemodeChar,
                      char openparenthesis_char, char closeparenthesis_char, bool removeParenthesisChars, char comment_char)
 {
-  SubString::splitLine(this->strings, this->bInSafemode, string, delimiters, delimiterNeighbours, emptyEntries, escapeChar, removeExcapeChar, safemode_char, removeSafemodeChar, openparenthesis_char, closeparenthesis_char, removeParenthesisChars, comment_char);
+  SubString::splitLine(this->strings, this->bInSafemode, string, delimiters, delimiterNeighbours, emptyEntries, escapeChar, removeEscapeChar, safemode_char, removeSafemodeChar, openparenthesis_char, closeparenthesis_char, removeParenthesisChars, comment_char);
 }
 

code/trunk/src/util/SubString.h

@@ -89 +89 @@
   SubString(const std::string& string,
             const std::string& delimiters, const std::string& delimiterNeighbours = "", bool emptyEntries=false,
-            char escapeChar ='\\', bool removeExcapeChar = true, char safemode_char = '"', bool removeSafemodeChar = true,
+            char escapeChar ='\\', bool removeEscapeChar = true, char safemode_char = '"', bool removeSafemodeChar = true,
             char openparenthesis_char = '(', char closeparenthesis_char = ')',  bool removeParenthesisChars = true, char comment_char = '\0');
   SubString(unsigned int argc, const char** argv);