config/ChangeLog:

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / src / chrono.cc

diff --git a/libstdc++-v3/src/chrono.cc b/libstdc++-v3/src/chrono.cc
index 88fb4c1..4dcd74b 100644 (file)
--- a/libstdc++-v3/src/chrono.cc
+++ b/libstdc++-v3/src/chrono.cc
@@ -1,11 +1,11 @@
 // chrono -*- C++ -*-
 
-// Copyright (C) 2008 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
 // terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
+// Free Software Foundation; either version 3, or (at your option)
 // any later version.
 
 // This library is distributed in the hope that it will be useful,
@@ -13,19 +13,14 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
 
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
 
 #include <chrono>
 
@@ -38,39 +33,48 @@
 #include <sys/time.h>
 #endif
 
-namespace std
-{
+_GLIBCXX_BEGIN_NAMESPACE(std)
+
   namespace chrono
   {
-    const bool system_clock::is_monotonic;
+    constexpr bool system_clock::is_monotonic;
 
     system_clock::time_point
-    system_clock::now()
+    system_clock::now() throw ()
     {
-#ifdef _GLIBCXX_USE_CLOCK_MONOTONIC
-        timespec tp;
-        // -EINVAL, -EFAULT
-        clock_gettime(CLOCK_MONOTONIC, &tp);
-        return time_point(duration(chrono::seconds(tp.tv_sec)
-                                   + chrono::nanoseconds(tp.tv_nsec)));
-#elif defined(_GLIBCXX_USE_CLOCK_REALTIME)
-        timespec tp;
-        // -EINVAL, -EFAULT
-        clock_gettime(CLOCK_REALTIME, &tp);
-        return time_point(duration(chrono::seconds(tp.tv_sec)
-                                   + chrono::nanoseconds(tp.tv_nsec)));
+#ifdef _GLIBCXX_USE_CLOCK_REALTIME
+      timespec tp;
+      // -EINVAL, -EFAULT
+      clock_gettime(CLOCK_REALTIME, &tp);
+      return time_point(duration(chrono::seconds(tp.tv_sec)
+                                + chrono::nanoseconds(tp.tv_nsec)));
 #elif defined(_GLIBCXX_USE_GETTIMEOFDAY)
-        timeval tv;
-        // EINVAL, EFAULT
-        gettimeofday(&tv, NULL);
-        return time_point(duration(chrono::seconds(tv.tv_sec)
-                                   + chrono::microseconds(tv.tv_usec)));
+      timeval tv;
+      // EINVAL, EFAULT
+      gettimeofday(&tv, 0);
+      return time_point(duration(chrono::seconds(tv.tv_sec)
+                                + chrono::microseconds(tv.tv_usec)));
 #else
-        std::time_t __sec = std::time(0);
-        return system_clock::from_time_t(__sec);
+      std::time_t __sec = std::time(0);
+      return system_clock::from_time_t(__sec);
 #endif
     }
+    
+#ifdef _GLIBCXX_USE_CLOCK_MONOTONIC
+    constexpr bool monotonic_clock::is_monotonic;
+    
+    monotonic_clock::time_point
+    monotonic_clock::now()
+    {
+      timespec tp;
+      // -EINVAL, -EFAULT
+      clock_gettime(CLOCK_MONOTONIC, &tp);
+      return time_point(duration(chrono::seconds(tp.tv_sec)
+                                + chrono::nanoseconds(tp.tv_nsec)));
+    }
+#endif
   }
-}
+
+_GLIBCXX_END_NAMESPACE
 
 #endif // _GLIBCXX_USE_C99_STDINT_TR1