fork
Fork of cpputest by
Diff: include/CppUTest/SimpleString.h
- Revision:
- 1:4769360130ed
- Parent:
- 0:0b799af9d58e
--- a/include/CppUTest/SimpleString.h Tue Jan 28 09:27:41 2014 +0000 +++ b/include/CppUTest/SimpleString.h Tue Jun 17 15:52:54 2014 +0100 @@ -90,13 +90,15 @@ static void setStringAllocator(TestMemoryAllocator* allocator); static char* allocStringBuffer(size_t size); + static char* StrNCpy(char* s1, const char* s2, size_t n); static void deallocStringBuffer(char* str); private: char *buffer_; static TestMemoryAllocator* stringAllocator_; - char* getEmptyString() const; + char* getEmptyString() const; + static char* copyToNewBuffer(const char* bufferToCopy, size_t bufferSize=0); }; class SimpleStringCollection @@ -124,15 +126,17 @@ SimpleString StringFrom(char value); SimpleString StringFrom(const char *value); SimpleString StringFromOrNull(const char * value); +SimpleString StringFrom(int value); +SimpleString StringFrom(unsigned int value); SimpleString StringFrom(long value); -SimpleString StringFrom(int value); +SimpleString StringFrom(unsigned long value); SimpleString HexStringFrom(long value); +SimpleString HexStringFrom(unsigned long value); SimpleString HexStringFrom(const void* value); SimpleString StringFrom(double value, int precision = 6); SimpleString StringFrom(const SimpleString& other); SimpleString StringFromFormat(const char* format, ...) __check_format__(printf, 1, 2); SimpleString VStringFromFormat(const char* format, va_list args); -SimpleString StringFrom(unsigned int value); #if CPPUTEST_USE_STD_CPP_LIB @@ -140,7 +144,6 @@ #include <stdint.h> SimpleString StringFrom(const std::string& other); -SimpleString StringFrom(unsigned long); #endif