Removed redundant spaces

[libcds.git] / cds / compiler / gcc / ia64 / bitop.h

diff --git a/cds/compiler/gcc/ia64/bitop.h b/cds/compiler/gcc/ia64/bitop.h
index ef6846089dad8e320165d3d6f1b963647ae3d712..4363081dd77fe7d59a8730866c5e796b30f6405d 100644 (file)
--- a/cds/compiler/gcc/ia64/bitop.h
+++ b/cds/compiler/gcc/ia64/bitop.h
@@ -1,4 +1,32 @@
-//$$CDS-header$$
+/*
+    This file is a part of libcds - Concurrent Data Structures library
+
+    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016
+
+    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_COMPILER_GCC_IA64_BITOP_H
 #define CDSLIB_COMPILER_GCC_IA64_BITOP_H
@@ -13,15 +41,15 @@ namespace cds {
         {
             if ( !nArg )
                 return 0;
-            atomic64u_t x = nArg;
+            uint64_t x = nArg;
             x |= x >> 1;
             x |= x >> 2;
             x |= x >> 4;
             x |= x >> 8;
             x |= x >> 16;
 
-            atomic64u_t    nRes;
-            asm __volatile__( "popcnt %0=%1\n\t" : "=r" (nRes) : "r" (x) );
+            uint64_t    nRes;
+            asm __volatile__( "popcnt %0=%1\n\t" : "=r" (nRes) : "r" (x));
             return (int) nRes;
         }
 
@@ -42,7 +70,7 @@ namespace cds {
         // MSB - return index (0..63) of most significant bit in nArg.
         // !!! nArg != 0
 #        define cds_bitop_msb64nz_DEFINED
-        static inline int msb64nz( atomic64u_t nArg )
+        static inline int msb64nz( uint64_t nArg )
         {
             assert( nArg != 0 );
             long double d = nArg;