|
8 | 8 | * |
9 | 9 | *************************************************************************** |
10 | 10 | **************************************************************************/ |
| 11 | +#include <ctime> |
11 | 12 | #include <stdio.h> |
12 | 13 | #include <stdlib.h> |
13 | | -#include <time.h> |
14 | 14 | #include <assert.h> |
15 | 15 | #include "TUnixTime.h" |
16 | 16 | #include "TDatime.h" |
@@ -111,30 +111,29 @@ void TUnixTime::SetLTime(Int_t idate, Int_t itime) |
111 | 111 | //______________________________________________________________________________ |
112 | 112 | void TUnixTime::GetGTime(Int_t &idate, Int_t &itime) |
113 | 113 | { |
114 | | - struct tm gt; |
115 | | - gt = *gmtime((time_t*)&fUTime); |
116 | | - tm2DateTime(idate,itime,>); |
| 114 | + std::time_t utime = fUTime; |
| 115 | + std::tm *gt = gmtime(&utime); |
| 116 | + tm2DateTime(idate, itime, gt); |
117 | 117 |
|
118 | 118 | } |
119 | 119 | //______________________________________________________________________________ |
120 | 120 | void TUnixTime::GetLTime(Int_t &idate, Int_t &itime) |
121 | 121 | { |
122 | | - struct tm gt; |
123 | | - gt = *localtime((time_t*)&fUTime); |
124 | | - tm2DateTime(idate,itime,>); |
125 | | - |
| 122 | + std::time_t utime = fUTime; |
| 123 | + std::tm *gt = localtime(&utime); |
| 124 | + tm2DateTime(idate, itime, gt); |
126 | 125 | } |
127 | 126 | //______________________________________________________________________________ |
128 | 127 | TString TUnixTime::GetLString() |
129 | 128 | { |
130 | | - TString ts(ctime((time_t*)&fUTime)); |
131 | | - return ts; |
| 129 | + std::time_t utime = fUTime; |
| 130 | + return TString(ctime(&utime)); |
132 | 131 | } |
133 | 132 | //______________________________________________________________________________ |
134 | 133 | TString TUnixTime::GetGString() |
135 | 134 | { |
136 | | - TString ts(asctime(gmtime((time_t*)&fUTime))); |
137 | | - return ts; |
| 135 | + std::time_t utime = fUTime; |
| 136 | + return TString(asctime(gmtime(&utime))); |
138 | 137 | } |
139 | 138 | //______________________________________________________________________________ |
140 | 139 | void TUnixTime::SetLTime(const TDatime &loc) |
|
0 commit comments