Merge branch 'master' into die-autoptr-die

jezhiggins · Apr 23, 2020 · c34ca2c · c34ca2c
2 parents 6659a9f + 7f88a64
commit c34ca2c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 147 deletions.
diff --git a/include/DOM/Events/Event.hpp b/include/DOM/Events/Event.hpp
@@ -89,7 +89,7 @@ class Event_impl
 
     virtual bool getCancelable() const = 0;
 
-    virtual long getTimeStamp() const = 0;
+    virtual unsigned long long getTimeStamp() const = 0;
 
     virtual void stopPropagation() = 0;
 

diff --git a/include/DOM/Simple/EventImpl.hpp b/include/DOM/Simple/EventImpl.hpp
@@ -86,7 +86,7 @@ class EventImpl : virtual public Arabica::DOM::Events::Event_impl<stringT, strin
       return canCancel_;
     }
 
-    virtual long getTimeStamp() const
+    virtual unsigned long long getTimeStamp() const
     {
       return timeStamp_;
     }

diff --git a/vs2012/test_xslt_wide.vcxproj.bak b/vs2012/test_xslt_wide.vcxproj.bak