From 76d8443e8249f77f01c8ccc41e966827f076280f Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Fri, 26 Jul 2013 03:11:47 +0000 Subject: Removed an incorrect formatter << operator, and corrected a const_iterator vs iterator issue in Bu::String. --- src/stable/formatter.cpp | 6 ------ src/stable/formatter.h | 1 - src/stable/string.cpp | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) (limited to 'src/stable') 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 ) return f; } -Bu::Formatter &Bu::operator<<( Bu::Formatter &f, char *sStr ) -{ - f.writeAligned( sStr, strlen( sStr ) ); - return f; -} - Bu::Formatter &Bu::operator<<( Bu::Formatter &f, const Bu::String &sStr ) { 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 Formatter &operator<<( Formatter &f, const Fmt &fmt ); Formatter &operator<<( Formatter &f, Formatter::Special s ); Formatter &operator<<( Formatter &f, const char *sStr ); - Formatter &operator<<( Formatter &f, char *sStr ); Formatter &operator<<( Formatter &f, const Bu::String &sStr ); Formatter &operator<<( Formatter &f, signed char c ); 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 { if( core->nLength == 0 ) return const_iterator( NULL, 0 ); - return iterator( core->pFirst, 0 ); + return const_iterator( core->pFirst, 0 ); } Bu::String::iterator Bu::String::end() -- cgit v1.2.3