Mercurial > hg > octave-lyh
diff liboctave/str-vec.h @ 3504:5eef8a2294bd
[project @ 2000-02-01 10:06:51 by jwe]
author | jwe |
---|---|
date | Tue, 01 Feb 2000 10:07:26 +0000 |
parents | d14c483b3c12 |
children | d9803711e047 |
line wrap: on
line diff
--- a/liboctave/str-vec.h +++ b/liboctave/str-vec.h @@ -31,26 +31,26 @@ static int str_vec_compare (const void *a_arg, const void *b_arg) { - const string *a = (const string *) a_arg; - const string *b = (const string *) b_arg; + const std::string *a = (const std::string *) a_arg; + const std::string *b = (const std::string *) b_arg; return a->compare (*b); } class -string_vector : public Array<string> +string_vector : public Array<std::string> { public: - string_vector (void) : Array<string> () { } + string_vector (void) : Array<std::string> () { } - string_vector (int n) : Array<string> (n) { } + string_vector (int n) : Array<std::string> (n) { } - string_vector (const char *s) : Array<string> (1, s) { } + string_vector (const char *s) : Array<std::string> (1, s) { } - string_vector (const string& s) : Array<string> (1, s) { } + string_vector (const std::string& s) : Array<std::string> (1, s) { } - string_vector (const string_vector& s) : Array<string> (s) { } + string_vector (const string_vector& s) : Array<std::string> (s) { } string_vector (const char * const *s); @@ -59,7 +59,7 @@ string_vector& operator = (const string_vector& s) { if (this != &s) - Array<string>::operator = (s); + Array<std::string>::operator = (s); return *this; } @@ -84,13 +84,13 @@ return longest; } - string& operator[] (int i) { return Array<string>::elem (i); } + std::string& operator[] (int i) { return Array<std::string>::elem (i); } - string operator[] (int i) const { return Array<string>::elem (i); } + std::string operator[] (int i) const { return Array<std::string>::elem (i); } string_vector& qsort (bool make_unique = false) { - Array<string>::qsort (str_vec_compare); + Array<std::string>::qsort (str_vec_compare); if (make_unique) uniq (); @@ -104,7 +104,7 @@ static void delete_c_str_vec (const char * const*); - ostream& list_in_columns (ostream&) const; + std::ostream& list_in_columns (std::ostream&) const; }; #endif