Changeset 1431

Timestamp:

Dec 17, 2011, 3:11:18 AM (11 years ago)

Author:

Peter Johansson

Message:

prefer yat's convert function and avoid tmp variables

File:

• trunk/lib/Date.cc (modified) (5 diffs)

trunk/lib/Date.cc

@@ -22 +22 @@
 
 #include "Date.h"
+
+#include "yat/utility.h"
 
 #include <algorithm>
@@ -90 +92 @@
       ss << " and ";
     }
-    
+
 
     unsigned int day = (t1-t0)/24/60/60;
@@ -108 +110 @@
     time_t timezone_correction = timeinfo->tm_gmtoff;
 
-    unsigned int year, month, day, hour, minute, second;
     std::string tmp;
     std::getline(sstream,tmp,'-');
-    year=atoi(tmp.c_str());
-    timeinfo->tm_year = year - 1900;
+    using yat::utility::convert;
+    timeinfo->tm_year = convert<unsigned int>(tmp) - 1900;
 
     std::getline(sstream,tmp,'-');
-    month=atoi(tmp.c_str());
-    timeinfo->tm_mon = month - 1;
+    timeinfo->tm_mon = convert<unsigned int>(tmp) - 1;
 
     std::getline(sstream,tmp,'T');
-    day=atoi(tmp.c_str());
-    timeinfo->tm_mday = day;
+    timeinfo->tm_mday = convert<unsigned int>(tmp);
 
     std::getline(sstream,tmp,':');
-    hour=atoi(tmp.c_str());
-    timeinfo->tm_hour = hour;
+    timeinfo->tm_hour = convert<unsigned int>(tmp);
 
     std::getline(sstream,tmp,':');
-    minute=atoi(tmp.c_str());
-    timeinfo->tm_min = minute;
+    timeinfo->tm_min = convert<unsigned int>(tmp);
 
     std::getline(sstream,tmp,'.');
-    second=atoi(tmp.c_str());
-    timeinfo->tm_sec = second;
+    timeinfo->tm_sec = convert<unsigned int>(tmp);
 
     time_ = mktime(timeinfo);
@@ -143 +139 @@
     std::stringstream ss;
     struct tm* timeinfo = std::gmtime(&time_);
-    char buffer[80]; 
+    char buffer[80];
     size_t res = std::strftime(buffer, 80, format.c_str(), timeinfo);
     if (!res) {
@@ -152 +148 @@
 
 
-  const Date& Date::operator=(const Date& rhs) 
+  const Date& Date::operator=(const Date& rhs)
   {
     time_ = rhs.time_;