diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-23 06:36:30 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-23 06:36:30 +0400 |
| commit | 190f5d17871a714bb864e271985ea6e4c5d6b3d0 (patch) | |
| tree | ee2678fac93bf9e0d1e8696da65564650adf3551 /intern/string/STR_String.h | |
| parent | c8b53d2aaf7ee4d07736cf842ca385e0311f3c53 (diff) | |
code cleanup: dont set the namespace in STR_String.h - 'using namespace std', since this is included in many places.
Diffstat (limited to 'intern/string/STR_String.h')
| -rw-r--r-- | intern/string/STR_String.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/intern/string/STR_String.h b/intern/string/STR_String.h index cbf9d0c1b3b..2f17b059c8f 100644 --- a/intern/string/STR_String.h +++ b/intern/string/STR_String.h @@ -51,8 +51,6 @@ #include <cstring> #include <cstdlib> -using namespace std; - #ifdef WITH_CXX_GUARDEDALLOC #include "MEM_guardedalloc.h" #endif @@ -95,8 +93,10 @@ public: inline void Clear() { Len = pData[0] = 0; } inline const STR_String & Reverse() { - for (int i1=0, i2=Len-1; i1<i2; i1++, i2--) - swap(pData[i1], pData[i2]); return *this; + for (int i1 = 0, i2 = Len - 1; i1 < i2; i1++, i2--) { + std::swap(pData[i1], pData[i2]); + } + return *this; } // Properties @@ -133,7 +133,7 @@ public: int FindOneOf(const char *set, int pos = 0) const; int RFindOneOf(const char *set, int pos = 0) const; - vector<STR_String> Explode(char c) const; + std::vector<STR_String> Explode(char c) const; // Formatting STR_String& Upper(); |