summaryrefslogtreecommitdiff
path: root/boost/smart_ptr/detail
diff options
context:
space:
mode:
Diffstat (limited to 'boost/smart_ptr/detail')
-rw-r--r--boost/smart_ptr/detail/sp_counted_base_clang.hpp4
-rw-r--r--boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp6
-rw-r--r--boost/smart_ptr/detail/sp_counted_base_std_atomic.hpp4
3 files changed, 10 insertions, 4 deletions
diff --git a/boost/smart_ptr/detail/sp_counted_base_clang.hpp b/boost/smart_ptr/detail/sp_counted_base_clang.hpp
index 8b3bfad9b6..5d6e073d95 100644
--- a/boost/smart_ptr/detail/sp_counted_base_clang.hpp
+++ b/boost/smart_ptr/detail/sp_counted_base_clang.hpp
@@ -70,8 +70,8 @@ private:
sp_counted_base( sp_counted_base const & );
sp_counted_base & operator= ( sp_counted_base const & );
- atomic_int_least32_t use_count_; // #shared
- atomic_int_least32_t weak_count_; // #weak + (#shared != 0)
+ atomic_int_least32_t use_count_; // #shared
+ atomic_int_least32_t weak_count_; // #weak + (#shared != 0)
public:
diff --git a/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp b/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp
index 76ac2a612d..c3175cf8ed 100644
--- a/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp
+++ b/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp
@@ -38,7 +38,9 @@ inline void atomic_increment( int * pw )
(
"0:\n\t"
".set push\n\t"
+#if !defined(__mips_isa_rev) || (__mips_isa_rev < 6)
".set mips2\n\t"
+#endif
"ll %0, %1\n\t"
"addiu %0, 1\n\t"
"sc %0, %1\n\t"
@@ -59,7 +61,9 @@ inline int atomic_decrement( int * pw )
(
"0:\n\t"
".set push\n\t"
+#if !defined(__mips_isa_rev) || (__mips_isa_rev < 6)
".set mips2\n\t"
+#endif
"ll %1, %2\n\t"
"addiu %0, %1, -1\n\t"
"sc %0, %2\n\t"
@@ -85,7 +89,9 @@ inline int atomic_conditional_increment( int * pw )
(
"0:\n\t"
".set push\n\t"
+#if !defined(__mips_isa_rev) || (__mips_isa_rev < 6)
".set mips2\n\t"
+#endif
"ll %0, %2\n\t"
"beqz %0, 1f\n\t"
"addiu %1, %0, 1\n\t"
diff --git a/boost/smart_ptr/detail/sp_counted_base_std_atomic.hpp b/boost/smart_ptr/detail/sp_counted_base_std_atomic.hpp
index 7a188f8a66..9f562b9b4a 100644
--- a/boost/smart_ptr/detail/sp_counted_base_std_atomic.hpp
+++ b/boost/smart_ptr/detail/sp_counted_base_std_atomic.hpp
@@ -64,8 +64,8 @@ private:
sp_counted_base( sp_counted_base const & );
sp_counted_base & operator= ( sp_counted_base const & );
- std::atomic_int_least32_t use_count_; // #shared
- std::atomic_int_least32_t weak_count_; // #weak + (#shared != 0)
+ std::atomic_int_least32_t use_count_; // #shared
+ std::atomic_int_least32_t weak_count_; // #weak + (#shared != 0)
public: