Merge pull request #149 from tklab-tud/sradomski

remerge

2 files changed, 48 insertions, 48 deletions

diff --git a/contrib/src/boost/pending/integer_log2.hpp b/contrib/src/boost/pending/integer_log2.hpp
index 1b437bc..023ec7a 100644
--- a/contrib/src/boost/pending/integer_log2.hpp
+++ b/contrib/src/boost/pending/integer_log2.hpp
@@ -1,9 +1,9 @@
-#ifndef BOOST_PENDING_INTEGER_LOG2_HPP

-#define BOOST_PENDING_INTEGER_LOG2_HPP

-

-// The header file at this path is deprecated;

-// use boost/integer/integer_log2.hpp instead.

-

-#include <boost/integer/integer_log2.hpp>

-

-#endif

+#ifndef BOOST_PENDING_INTEGER_LOG2_HPP
+#define BOOST_PENDING_INTEGER_LOG2_HPP
+
+// The header file at this path is deprecated;
+// use boost/integer/integer_log2.hpp instead.
+
+#include <boost/integer/integer_log2.hpp>
+
+#endif
diff --git a/contrib/src/boost/pending/lowest_bit.hpp b/contrib/src/boost/pending/lowest_bit.hpp
index 6e4041b..dd6e6e8 100644
--- a/contrib/src/boost/pending/lowest_bit.hpp
+++ b/contrib/src/boost/pending/lowest_bit.hpp
@@ -1,39 +1,39 @@
-// -----------------------------------------------------------

-// lowest_bit.hpp

-//

-//           Position of the lowest bit 'on'

-//

-//         Copyright (c) 2003-2004, 2008 Gennaro Prota

-//

-// Distributed under the Boost Software License, Version 1.0.

-//    (See accompanying file LICENSE_1_0.txt or copy at

-//          http://www.boost.org/LICENSE_1_0.txt)

-//

-// -----------------------------------------------------------

-

-#ifndef BOOST_LOWEST_BIT_HPP_GP_20030301

-#define BOOST_LOWEST_BIT_HPP_GP_20030301

-

-#include <assert.h>

-#include "boost/pending/integer_log2.hpp"

-

-

-namespace boost {

-

-    template <typename T>

-    int lowest_bit(T x) {

-

-        assert(x >= 1); // PRE

-

-        // clear all bits on except the rightmost one,

-        // then calculate the logarithm base 2

-        //

-        return boost::integer_log2<T>( x - ( x & (x-1) ) );

-

-    }

-

-

-}

-

-

-#endif // include guard

+// -----------------------------------------------------------
+// lowest_bit.hpp
+//
+//           Position of the lowest bit 'on'
+//
+//         Copyright (c) 2003-2004, 2008 Gennaro Prota
+//
+// Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//          http://www.boost.org/LICENSE_1_0.txt)
+//
+// -----------------------------------------------------------
+
+#ifndef BOOST_LOWEST_BIT_HPP_GP_20030301
+#define BOOST_LOWEST_BIT_HPP_GP_20030301
+
+#include <assert.h>
+#include "boost/pending/integer_log2.hpp"
+
+
+namespace boost {
+
+    template <typename T>
+    int lowest_bit(T x) {
+
+        assert(x >= 1); // PRE
+
+        // clear all bits on except the rightmost one,
+        // then calculate the logarithm base 2
+        //
+        return boost::integer_log2<T>( x - ( x & (x-1) ) );
+
+    }
+
+
+}
+
+
+#endif // include guard