| @@ -25,17 +25,17 @@ namespace lol | |||||
| class String : protected Array<char> | class String : protected Array<char> | ||||
| { | { | ||||
| private: | private: | ||||
| typedef Array<char> super; | |||||
| typedef Array<char> Super; | |||||
| public: | public: | ||||
| inline String() | inline String() | ||||
| : Array() | |||||
| : Super() | |||||
| { | { | ||||
| Push('\0'); | Push('\0'); | ||||
| } | } | ||||
| inline String(char const *str) | inline String(char const *str) | ||||
| : Array() | |||||
| : Super() | |||||
| { | { | ||||
| do | do | ||||
| { | { | ||||
| @@ -46,12 +46,12 @@ public: | |||||
| inline char &operator [](int n) | inline char &operator [](int n) | ||||
| { | { | ||||
| return ((super &)*this)[n]; | |||||
| return ((Super &)*this)[n]; | |||||
| } | } | ||||
| inline char const &operator [](int n) const | inline char const &operator [](int n) const | ||||
| { | { | ||||
| return ((super const &)*this)[n]; | |||||
| return ((Super const &)*this)[n]; | |||||
| } | } | ||||
| inline String operator +(String const &s) | inline String operator +(String const &s) | ||||
| @@ -64,7 +64,7 @@ public: | |||||
| { | { | ||||
| /* Be careful, we have a trailing zero we don't want! */ | /* Be careful, we have a trailing zero we don't want! */ | ||||
| --m_count; | --m_count; | ||||
| (super &)*this += (super const &)s; | |||||
| (Super &)*this += (Super const &)s; | |||||
| return *this; | return *this; | ||||
| } | } | ||||
| }; | }; | ||||