@@ -52,9 +52,9 @@ class String: public string
52
52
public:
53
53
~String (void ) {}
54
54
String (const char *cstr = " " ): string(cstr) {}
55
- String (const string &str): string(str.c_str() ) {}
56
- String (const String &str): string(str.c_str() ) {}
57
- explicit String (char c): string(&c, 1 ) {}
55
+ String (const string &str): string(str) {}
56
+ String (const String &str): string(str) {}
57
+ explicit String (char c): string(1 , c ) {}
58
58
59
59
explicit String (unsigned char val, unsigned char base=10 ): string(mytoa(val, base)) {}
60
60
explicit String (int val, unsigned char base=10 ): string(mytoas(val, base)) {}
@@ -66,14 +66,14 @@ class String: public string
66
66
explicit String (double val, unsigned char decimalPlaces=2 ): string(dtoas(val, decimalPlaces)) {}
67
67
68
68
String & operator = (const String &rhs) { assign (rhs); return *this ; }
69
- String & operator = (const char *cstr ) { assign (cstr ); return *this ; }
70
-
71
- unsigned char reserve ( unsigned int size) { return true ; } // calling reserve(size) segfaults, no idea why
69
+ String & operator = (const string &rhs ) { assign (rhs ); return *this ; }
70
+ String & operator = ( const char *cstr) { assign (cstr); return * this ; }
71
+ String & operator = ( const char c) { assign ( 1 , c); return * this ; }
72
72
73
73
unsigned char concat (const String &str) { append (str); return 1 ; }
74
74
unsigned char concat (const char *cstr) { append (cstr); return 1 ; }
75
- unsigned char concat (char c) { append (( const char *)&c, 1 ); return 1 ; }
76
- unsigned char concat (unsigned char c) { append (( const char *)&c, 1 ); return 1 ; }
75
+ unsigned char concat (char c) { append (1 , c ); return 1 ; }
76
+ unsigned char concat (unsigned char c) { append (1 , c ); return 1 ; }
77
77
unsigned char concat (int num) { append (String (num)); return 1 ; }
78
78
unsigned char concat (unsigned int num) { append (String (num)); return 1 ; }
79
79
unsigned char concat (long num) { append (String (num)); return 1 ; }
0 commit comments