diff options
author | Mike Buland <eichlan@xagasoft.com> | 2013-07-26 03:11:47 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2013-07-26 03:11:47 +0000 |
commit | 76d8443e8249f77f01c8ccc41e966827f076280f (patch) | |
tree | 47c7740c08772314f0efbfb32e2a566ae7066919 /src | |
parent | e97cac3fbab4a00faeb3ddec08846307670b9a0e (diff) | |
download | libbu++-76d8443e8249f77f01c8ccc41e966827f076280f.tar.gz libbu++-76d8443e8249f77f01c8ccc41e966827f076280f.tar.bz2 libbu++-76d8443e8249f77f01c8ccc41e966827f076280f.tar.xz libbu++-76d8443e8249f77f01c8ccc41e966827f076280f.zip |
Removed an incorrect formatter << operator, and corrected a const_iterator vs
iterator issue in Bu::String.
Diffstat (limited to '')
-rw-r--r-- | src/stable/formatter.cpp | 6 | ||||
-rw-r--r-- | src/stable/formatter.h | 1 | ||||
-rw-r--r-- | src/stable/string.cpp | 2 |
3 files changed, 1 insertions, 8 deletions
diff --git a/src/stable/formatter.cpp b/src/stable/formatter.cpp index 4cfcf98..26f6d01 100644 --- a/src/stable/formatter.cpp +++ b/src/stable/formatter.cpp | |||
@@ -349,12 +349,6 @@ Bu::Formatter &Bu::operator<<( Bu::Formatter &f, const char *sStr ) | |||
349 | return f; | 349 | return f; |
350 | } | 350 | } |
351 | 351 | ||
352 | Bu::Formatter &Bu::operator<<( Bu::Formatter &f, char *sStr ) | ||
353 | { | ||
354 | f.writeAligned( sStr, strlen( sStr ) ); | ||
355 | return f; | ||
356 | } | ||
357 | |||
358 | Bu::Formatter &Bu::operator<<( Bu::Formatter &f, const Bu::String &sStr ) | 352 | Bu::Formatter &Bu::operator<<( Bu::Formatter &f, const Bu::String &sStr ) |
359 | { | 353 | { |
360 | f.writeAligned( sStr ); | 354 | f.writeAligned( sStr ); |
diff --git a/src/stable/formatter.h b/src/stable/formatter.h index 2d1c379..46934b9 100644 --- a/src/stable/formatter.h +++ b/src/stable/formatter.h | |||
@@ -261,7 +261,6 @@ namespace Bu | |||
261 | Formatter &operator<<( Formatter &f, const Fmt &fmt ); | 261 | Formatter &operator<<( Formatter &f, const Fmt &fmt ); |
262 | Formatter &operator<<( Formatter &f, Formatter::Special s ); | 262 | Formatter &operator<<( Formatter &f, Formatter::Special s ); |
263 | Formatter &operator<<( Formatter &f, const char *sStr ); | 263 | Formatter &operator<<( Formatter &f, const char *sStr ); |
264 | Formatter &operator<<( Formatter &f, char *sStr ); | ||
265 | Formatter &operator<<( Formatter &f, const Bu::String &sStr ); | 264 | Formatter &operator<<( Formatter &f, const Bu::String &sStr ); |
266 | Formatter &operator<<( Formatter &f, signed char c ); | 265 | Formatter &operator<<( Formatter &f, signed char c ); |
267 | Formatter &operator<<( Formatter &f, char c ); | 266 | Formatter &operator<<( Formatter &f, char c ); |
diff --git a/src/stable/string.cpp b/src/stable/string.cpp index 77d7c26..bf3aac0 100644 --- a/src/stable/string.cpp +++ b/src/stable/string.cpp | |||
@@ -1174,7 +1174,7 @@ Bu::String::const_iterator Bu::String::begin() const | |||
1174 | { | 1174 | { |
1175 | if( core->nLength == 0 ) | 1175 | if( core->nLength == 0 ) |
1176 | return const_iterator( NULL, 0 ); | 1176 | return const_iterator( NULL, 0 ); |
1177 | return iterator( core->pFirst, 0 ); | 1177 | return const_iterator( core->pFirst, 0 ); |
1178 | } | 1178 | } |
1179 | 1179 | ||
1180 | Bu::String::iterator Bu::String::end() | 1180 | Bu::String::iterator Bu::String::end() |