Mercurial > octave-nkf
diff liboctave/oct-time.cc @ 3504:5eef8a2294bd
[project @ 2000-02-01 10:06:51 by jwe]
| author | jwe |
|---|---|
| date | Tue, 01 Feb 2000 10:07:26 +0000 |
| parents | e391aeef2b3c |
| children | 26662775f4e9 |
line wrap: on
line diff
--- a/liboctave/oct-time.cc Tue Feb 01 04:06:39 2000 +0000 +++ b/liboctave/oct-time.cc Tue Feb 01 10:07:26 2000 +0000 @@ -51,7 +51,7 @@ t.tm_isdst = tm.isdst (); #if defined (HAVE_TM_ZONE) - string s = tm.zone (); + std::string s = tm.zone (); char *ps = strsave (s.c_str ()); t.tm_zone = ps; #endif @@ -65,7 +65,7 @@ ot_usec = tm.usec (); } -string +std::string octave_time::ctime (void) const { return octave_localtime (*this) . asctime (); @@ -120,7 +120,7 @@ DEFINE_SET_INT_FIELD_FCN (isdst, 0, 1) octave_base_tm& -octave_base_tm::zone (const string& s) +octave_base_tm::zone (const std::string& s) { tm_zone = s; return *this; @@ -130,10 +130,10 @@ #define STRFTIME_BUF_INITIAL_SIZE 128 #endif -string -octave_base_tm::strftime (const string& fmt) const +std::string +octave_base_tm::strftime (const std::string& fmt) const { - string retval; + std::string retval; struct tm t; @@ -224,7 +224,7 @@ } void -octave_strptime::init (const string& str, const string& fmt) +octave_strptime::init (const std::string& str, const std::string& fmt) { struct tm t;