From f94dd7ccee2014ab6240efbf5074b2f39dc32225 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Sat, 19 Nov 2016 02:24:03 +0300
Subject: Fix VC compilation error, CLang warnings

---
 examples/performance/time.cxx |  4 +--
 xml/parser.ixx                | 58 +++++++++++++++++++++----------------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/examples/performance/time.cxx b/examples/performance/time.cxx
index cfb6d09..ae5935f 100644
--- a/examples/performance/time.cxx
+++ b/examples/performance/time.cxx
@@ -3,7 +3,7 @@
 
 #include "time.hxx"
 
-#if defined (WIN32) || defined (__WIN32__)
+#ifdef _WIN32
 #  define WIN32_LEAN_AND_MEAN
 #  include <windows.h>  // GetSystemTimeAsFileTime
 #else
@@ -19,7 +19,7 @@ namespace os
   time::
   time ()
   {
-#if defined (WIN32) || defined (__WIN32__)
+#ifdef _WIN32
     FILETIME ft;
     GetSystemTimeAsFileTime (&ft);
     unsigned long long v (
diff --git a/xml/parser.ixx b/xml/parser.ixx
index f531fca..eba6e5d 100644
--- a/xml/parser.ixx
+++ b/xml/parser.ixx
@@ -73,6 +73,12 @@ namespace xml
     return value_traits<T>::parse (value (), *this);
   }
 
+  inline const parser::element_entry* parser::
+  get_element () const
+  {
+    return element_state_.empty () ? 0 : get_element_ ();
+  }
+
   inline const std::string& parser::
   attribute (const std::string& n) const
   {
@@ -136,32 +142,6 @@ namespace xml
     next_expect (e, std::string (), n);
   }
 
-  inline void parser::
-  next_expect (event_type e, const qname_type& qn, content_type c)
-  {
-    next_expect (e, qn);
-    assert (e == start_element);
-    content (c);
-  }
-
-  inline void parser::
-  next_expect (event_type e, const std::string& n, content_type c)
-  {
-    next_expect (e, std::string (), n);
-    assert (e == start_element);
-    content (c);
-  }
-
-  inline void parser::
-  next_expect (event_type e,
-               const std::string& ns, const std::string& n,
-               content_type c)
-  {
-    next_expect (e, ns, n);
-    assert (e == start_element);
-    content (c);
-  }
-
   template <typename T>
   inline T parser::
   element ()
@@ -232,9 +212,29 @@ namespace xml
       : content_type (content_type::mixed);
   }
 
-  inline const parser::element_entry* parser::
-  get_element () const
+  inline void parser::
+  next_expect (event_type e, const qname_type& qn, content_type c)
   {
-    return element_state_.empty () ? 0 : get_element_ ();
+    next_expect (e, qn);
+    assert (e == start_element);
+    content (c);
+  }
+
+  inline void parser::
+  next_expect (event_type e, const std::string& n, content_type c)
+  {
+    next_expect (e, std::string (), n);
+    assert (e == start_element);
+    content (c);
+  }
+
+  inline void parser::
+  next_expect (event_type e,
+               const std::string& ns, const std::string& n,
+               content_type c)
+  {
+    next_expect (e, ns, n);
+    assert (e == start_element);
+    content (c);
   }
 }
-- 
cgit v1.1