Fixed some lines that were too long. It compiled afterwards.

[lyx.git] / boost / boost / detail / atomic_count.hpp

diff --git a/boost/boost/detail/atomic_count.hpp b/boost/boost/detail/atomic_count.hpp
index 3ad92b1c324d9f3a73b3a074374eb17ba74e4060..9985b2cede5bb0b4ffdbaa4fc8fdc3db035ffc17 100644 (file)
--- a/boost/boost/detail/atomic_count.hpp
+++ b/boost/boost/detail/atomic_count.hpp
@@ -73,9 +73,6 @@
 //      are called driven by smart_ptr interface...
 //
 
-//  Note: atomic_count_linux.hpp has been disabled by default; see the
-//        comments inside for more info.
-
 #include <boost/config.hpp>
 
 #ifndef BOOST_HAS_THREADS
@@ -92,13 +89,11 @@ typedef long atomic_count;
 
 }
 
-#elif defined(BOOST_USE_ASM_ATOMIC_H)
-#  include <boost/detail/atomic_count_linux.hpp>
 #elif defined(BOOST_AC_USE_PTHREADS)
 #  include <boost/detail/atomic_count_pthreads.hpp>
 #elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
 #  include <boost/detail/atomic_count_win32.hpp>
-#elif defined(__GLIBCPP__)
+#elif defined(__GLIBCPP__) || defined(__GLIBCXX__)
 #  include <boost/detail/atomic_count_gcc.hpp>
 #elif defined(BOOST_HAS_PTHREADS)
 #  define BOOST_AC_USE_PTHREADS