fixup Fix to build with libxml 2.12.x (fixes #505)

[platform/upstream/libzypp.git] / zypp / Date.cc

diff --git a/zypp/Date.cc b/zypp/Date.cc
index 45fc492..2534595 100644 (file)
--- a/zypp/Date.cc
+++ b/zypp/Date.cc
@@ -10,12 +10,12 @@
  *
 */
 #include <iostream>
-//#include "zypp/base/Logger.h"
+//#include <zypp/base/Logger.h>
 
-#include "zypp/base/String.h"
-#include "zypp/base/Xml.h"
+#include <zypp/base/String.h>
+#include <zypp/base/Xml.h>
 
-#include "zypp/Date.h"
+#include <zypp/Date.h>
 
 using std::endl;
 
@@ -99,7 +99,7 @@ namespace zypp
        "%G-W%V-%u",    ///< 2014-W06-5 (1 is Monday)
        "%Y-%j",        ///< 2014-038
       };
-      return fmt[static_cast<std::underlying_type<Date::DateFormat>::type>(dateFormat_r)];
+      return fmt[dateFormat_r.asIntegral()];
     }
 
     inline const char * _timeFormat( Date::TimeFormat timeFormat_r )
@@ -110,7 +110,7 @@ namespace zypp
        "%H:%M",        ///< 07:06
        "%H",           ///< 07
       };
-      return fmt[static_cast<std::underlying_type<Date::TimeFormat>::type>(timeFormat_r)];
+      return fmt[timeFormat_r.asIntegral()];
     }
 
     inline const char * _timeZoneFormat( Date::TimeZoneFormat timeZoneFormat_r )
@@ -120,7 +120,7 @@ namespace zypp
        " %Z",          ///< UTC, CET, ...
        "%z",           ///< +0000
       };
-      return fmt[static_cast<std::underlying_type<Date::TimeZoneFormat>::type>(timeZoneFormat_r)];
+      return fmt[timeZoneFormat_r.asIntegral()];
     }
 
     inline std::string doForm( const std::string & format_r, Date::TimeBase base_r, const Date::ValueType & date_r )
@@ -211,7 +211,7 @@ namespace zypp
       if ( dateFormat_r != DateFormat::none )
        str << 'T';
       str << _timeFormat( timeFormat_r );
-      switch ( timeZoneFormat_r )
+      switch ( timeZoneFormat_r.asEnum() )
       {
        case TimeZoneFormat::none:
          break;
@@ -234,7 +234,7 @@ namespace zypp
   {
     return xmlout::node( str, name_r, {
       { "time_t",      Date::ValueType(obj) },
-      { "text",                obj.printISO() },
+      { "text",                obj.printISO( Date::TB_UTC ) },
     } );
   }