linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2761
committer: Jacek Sieka <arnetheduck@xxxxxxxxx>
branch nick: dcplusplus
timestamp: Tue 2011-12-27 21:06:53 +0100
message:
  Fix header name, use atomics for pointer
renamed:
  dcpp/atomic.hpp => dcpp/atomic.h
modified:
  dcpp/BufferedSocket.h
  dcpp/Client.h
  dcpp/MappingManager.h
  dcpp/Pointer.h
  dcpp/ShareManager.h
  dcpp/atomic.h


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'dcpp/BufferedSocket.h'
--- dcpp/BufferedSocket.h	2011-12-27 19:47:56 +0000
+++ dcpp/BufferedSocket.h	2011-12-27 20:06:53 +0000
@@ -29,7 +29,7 @@
 #include "Thread.h"
 #include "Speaker.h"
 #include "Socket.h"
-#include "atomic.hpp"
+#include "atomic.h"
 
 namespace dcpp {
 

=== modified file 'dcpp/Client.h'
--- dcpp/Client.h	2011-12-27 19:47:56 +0000
+++ dcpp/Client.h	2011-12-27 20:06:53 +0000
@@ -28,7 +28,7 @@
 #include "TimerManager.h"
 #include "ClientListener.h"
 #include "OnlineUser.h"
-#include "atomic.hpp"
+#include "atomic.h"
 
 namespace dcpp {
 

=== modified file 'dcpp/MappingManager.h'
--- dcpp/MappingManager.h	2011-12-27 19:47:56 +0000
+++ dcpp/MappingManager.h	2011-12-27 20:06:53 +0000
@@ -27,7 +27,7 @@
 #include "typedefs.h"
 #include "Mapper.h"
 #include "TimerManager.h"
-#include "atomic.hpp"
+#include "atomic.h"
 
 namespace dcpp {
 

=== modified file 'dcpp/Pointer.h'
--- dcpp/Pointer.h	2011-09-24 21:13:31 +0000
+++ dcpp/Pointer.h	2011-12-27 20:06:53 +0000
@@ -20,11 +20,11 @@
 #define DCPLUSPLUS_DCPP_POINTER_H
 
 #include <boost/intrusive_ptr.hpp>
-#include <boost/smart_ptr/detail/atomic_count.hpp>
 
 #include <memory>
 
 #include "noexcept.h"
+#include "atomic.h"
 
 namespace dcpp {
 
@@ -46,7 +46,7 @@
 	friend void intrusive_ptr_add_ref(intrusive_ptr_base* p) { ++p->ref; }
 	friend void intrusive_ptr_release(intrusive_ptr_base* p) { if(--p->ref == 0) { delete static_cast<T*>(p); } }
 
-	boost::detail::atomic_count ref;
+	atomic<long> ref;
 };
 
 struct DeleteFunction {

=== modified file 'dcpp/ShareManager.h'
--- dcpp/ShareManager.h	2011-12-27 19:47:56 +0000
+++ dcpp/ShareManager.h	2011-12-27 20:06:53 +0000
@@ -39,7 +39,7 @@
 #include "MerkleTree.h"
 #include "Pointer.h"
 
-#include "atomic.hpp"
+#include "atomic.h"
 
 namespace dcpp {
 

=== renamed file 'dcpp/atomic.hpp' => 'dcpp/atomic.h'
--- dcpp/atomic.hpp	2011-12-27 19:47:56 +0000
+++ dcpp/atomic.h	2011-12-27 20:06:53 +0000
@@ -23,7 +23,7 @@
 // MSVC 10 doesn't have atomic at all
 #if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)) || defined(_MSC_VER)
 
-#include <boost/atomic/atomic.hpp>
+#include <boost/atomic/atomic.h>
 
 namespace dcpp
 {