diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-07-02 07:32:57 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-07-02 07:32:57 +0400 |
| commit | b1a106dd49a8653977cdfd722b1d30abf827fa28 (patch) | |
| tree | 8e222aadcd1b2bfd92a8ceb42f0cbd0333466b93 /intern | |
| parent | 78939898c735d6f2048e9fc2aa64a3188ff5732f (diff) | |
NLA SoC: Merge from 2.5
21210 to 21300
Note to self: the next merge will be messy again, since 2 commits occurred this one was complete
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/string/intern/STR_String.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/string/intern/STR_String.cpp b/intern/string/intern/STR_String.cpp index dcc52e2a3e7..646b1a853dc 100644 --- a/intern/string/intern/STR_String.cpp +++ b/intern/string/intern/STR_String.cpp @@ -559,7 +559,8 @@ STR_String& STR_String::TrimLeft() { int skip; assertd(pData != NULL); - for (skip=0; isSpace(pData[skip]); skip++, Len--); + for (skip=0; isSpace(pData[skip]); skip++, Len--) + {}; memmove(pData, pData+skip, Len+1); return *this; } @@ -598,7 +599,8 @@ STR_String& STR_String::TrimLeft(char *set) { int skip; assertd(pData != NULL); - for (skip=0; Len && strchr(set, pData[skip]); skip++, Len--); + for (skip=0; Len && strchr(set, pData[skip]); skip++, Len--) + {}; memmove(pData, pData+skip, Len+1); return *this; } |