[Libreoffice-commits] core.git: slideshow/source

Michael Stahl mstahl at redhat.com
Wed May 25 12:27:54 UTC 2016


 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit d6eef45d4ddb7d5b2d80d61e5dc09b14b64787f6
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed May 25 14:24:46 2016 +0200

    slideshow: appease MSVC 2013 with the std::chrono types
    
    Change-Id: I00ecc510192e71b12f746f876d564ac9b7c3a6c5

diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 1da561c..a428e99 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -102,7 +102,7 @@ public:
     }
 private:
     OUString const m_aWhat;
-    std::chrono::time_point<std::chrono::steady_clock> const m_StartTime;
+    std::chrono::steady_clock::time_point const m_StartTime;
 };
 #endif
 
@@ -254,10 +254,10 @@ public:
     bool mbValidOpenGLContext;
 
 #if OSL_DEBUG_LEVEL > 0
-    std::chrono::time_point<std::chrono::steady_clock> m_UpdateStartTime;
-    std::chrono::time_point<std::chrono::steady_clock> m_UpdateEndTime;
-    std::chrono::time_point<std::chrono::steady_clock> m_StartTime;
-    std::chrono::time_point<std::chrono::steady_clock> m_EndTime;
+    std::chrono::steady_clock::time_point m_UpdateStartTime;
+    std::chrono::steady_clock::time_point m_UpdateEndTime;
+    std::chrono::steady_clock::time_point m_StartTime;
+    std::chrono::steady_clock::time_point m_EndTime;
     std::chrono::steady_clock::duration m_TotalUpdateDuration;
     int mnFrameCount;
 #endif


More information about the Libreoffice-commits mailing list