i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

operation <<(): Use the standard types [unsigned] long [long] instead of

Browse Source 
[u]int32 and [u]int64 to avoid clashes with the int/unsigned int versions.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42165 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2011-06-14 01:07:16 +00:00
parent 07cadb8481
commit a928c3f001
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/support/String.h
+5 -5
View File
@@ -49,7 +49,7 @@ public:
BString& SetToChars(const char* string, int32 charCount);
BString& SetToChars(const BString& string, int32 charCount);
BString& AdoptChars(BString& from, int32 charCount);
BString& SetToFormat(const char* format, ...);
// Substring copying
@@ -309,10 +309,10 @@ public:
BString& operator<<(char c);
BString& operator<<(int value);
BString& operator<<(unsigned int value);
BString& operator<<(uint32 value);
BString& operator<<(int32 value);
BString& operator<<(uint64 value);
BString& operator<<(int64 value);
BString& operator<<(unsigned long value);
BString& operator<<(long value);
BString& operator<<(unsigned long long value);
BString& operator<<(long long value);
// float output hardcodes %.2f style formatting
BString& operator<<(float value);
src/kits/support/String.cpp
+6 -6
View File
@@ -428,7 +428,7 @@ BString::SetToFormat(const char* format, ...)
{
int32 bufferSize = 1024;
char buffer[bufferSize];
va_list arg;
va_start(arg, format);
int32 bytes = vsnprintf(buffer, bufferSize, format, arg);
@@ -1983,7 +1983,7 @@ BString::Trim()
// We actually need to trim
ssize_t length = endIndex + 1 - startCount;
ASSERT(length >= 0);
ASSERT(length >= 0);
if (startCount == 0 || length == 0) {
_MakeWritable(length, true);
} else if (_MakeWritable() == B_OK) {
@@ -2051,7 +2051,7 @@ BString::operator<<(unsigned int i)
BString&
BString::operator<<(uint32 i)
BString::operator<<(unsigned long i)
{
char num[32];
int32 length = snprintf(num, sizeof(num), "%lu", i);
@@ -2062,7 +2062,7 @@ BString::operator<<(uint32 i)
BString&
BString::operator<<(int32 i)
BString::operator<<(long i)
{
char num[32];
int32 length = snprintf(num, sizeof(num), "%ld", i);
@@ -2073,7 +2073,7 @@ BString::operator<<(int32 i)
BString&
BString::operator<<(uint64 i)
BString::operator<<(unsigned long long i)
{
char num[64];
int32 length = snprintf(num, sizeof(num), "%llu", i);
@@ -2084,7 +2084,7 @@ BString::operator<<(uint64 i)
BString&
BString::operator<<(int64 i)
BString::operator<<(long long i)
{
char num[64];
int32 length = snprintf(num, sizeof(num), "%lld", i);