Mercurial > hg > svcore
comparison base/RealTime.cpp @ 689:573d45e9487b
Merge from debug-output branch
author | Chris Cannam |
---|---|
date | Tue, 14 Jun 2011 14:47:59 +0100 |
parents | 06f13a3b9e9e |
children | 1424aa29ae95 |
comparison
equal
deleted
inserted
replaced
688:be43b2fe68e8 | 689:573d45e9487b |
---|---|
240 | 240 |
241 int sec = atoi(ssec.c_str()); | 241 int sec = atoi(ssec.c_str()); |
242 int nsec = atoi(snsec.c_str()); | 242 int nsec = atoi(snsec.c_str()); |
243 if (negative) sec = -sec; | 243 if (negative) sec = -sec; |
244 | 244 |
245 // std::cerr << "RealTime::fromString: string " << s << " -> " | 245 // DEBUG << "RealTime::fromString: string " << s << " -> " |
246 // << sec << " sec, " << nsec << " nsec" << std::endl; | 246 // << sec << " sec, " << nsec << " nsec" << endl; |
247 | 247 |
248 return RealTime(sec, nsec); | 248 return RealTime(sec, nsec); |
249 } | 249 } |
250 | 250 |
251 std::string | 251 std::string |