Refactors queue push pop

[libcds.git] / cds / os / linux / timer.h

diff --git a/cds/os/linux/timer.h b/cds/os/linux/timer.h
index f8a03fb267fb884d37ba7a26e81c10031dbc12e8..f23e0dfa8ad4ce0bb024ecd101a9f29c801f6546 100644 (file)
--- a/cds/os/linux/timer.h
+++ b/cds/os/linux/timer.h
@@ -1,9 +1,37 @@
-//$$CDS-header$$
+/*
+    This file is a part of libcds - Concurrent Data Structures library
 
-#ifndef __CDS_OS_LINUX_TIMER_H
-#define __CDS_OS_LINUX_TIMER_H
+    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2017
 
-#ifndef __CDS_OS_TIMER_H
+    Source code repo: http://github.com/khizmax/libcds/
+    Download: http://sourceforge.net/projects/libcds/files/
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, this
+      list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+    OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef CDSLIB_OS_LINUX_TIMER_H
+#define CDSLIB_OS_LINUX_TIMER_H
+
+#ifndef CDSLIB_OS_TIMER_H
 #   error "<cds/os/timer.h> must be included"
 #endif
 
@@ -44,7 +72,7 @@ namespace cds { namespace OS {
             {
                 native_timer_type ts;
                 current( ts );
-                double dblRet = ( ts.tv_sec - m_tmStart.tv_sec ) + ( ts.tv_nsec - m_tmStart.tv_nsec ) / 1.0E9;
+                double dblRet = double( ( ts.tv_sec - m_tmStart.tv_sec ) + ( ts.tv_nsec - m_tmStart.tv_nsec )) / 1.0E9;
                 m_tmStart = ts;
                 return dblRet;
             }
@@ -56,7 +84,7 @@ namespace cds { namespace OS {
 
             double duration()
             {
-                return duration( native_duration() );
+                return duration( native_duration());
             }
 
             native_duration_type    native_duration()
@@ -87,4 +115,4 @@ namespace cds { namespace OS {
 }}    // namespace cds::OS
 //@endcond
 
-#endif // #ifndef __CDS_OS_LINUX_TIMER_H
+#endif // #ifndef CDSLIB_OS_LINUX_TIMER_H