← Back to team overview

linuxdcpp-team team mailing list archive

[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 2725: fix initialization of non-boost atomic_flags

 

------------------------------------------------------------
revno: 2725
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sat 2011-12-17 17:25:32 +0100
message:
  fix initialization of non-boost atomic_flags
modified:
  atomic/boost/atomic.hpp
  dcpp/MappingManager.h
  dcpp/ShareManager.cpp


--
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 'atomic/boost/atomic.hpp'
--- atomic/boost/atomic.hpp	2011-12-16 17:07:49 +0000
+++ atomic/boost/atomic.hpp	2011-12-17 16:25:32 +0000
@@ -121,7 +121,8 @@
 
 class atomic_flag {
 public:
-	atomic_flag(void) : v_(false) {}
+	atomic_flag() : v_(false) {}
+	atomic_flag(bool b) : v_(b) {}
 	
 	bool
 	test_and_set(memory_order order = memory_order_seq_cst)

=== modified file 'dcpp/MappingManager.h'
--- dcpp/MappingManager.h	2011-12-16 17:07:49 +0000
+++ dcpp/MappingManager.h	2011-12-17 16:25:32 +0000
@@ -60,7 +60,7 @@
 	unique_ptr<Mapper> working; /// currently working implementation.
 	uint64_t renewal; /// when the next renewal should happen, if requested by the mapper.
 
-	MappingManager() : renewal(0) { }
+	MappingManager() : busy(false), renewal(0) { }
 	virtual ~MappingManager() { }
 
 	int run();

=== modified file 'dcpp/ShareManager.cpp'
--- dcpp/ShareManager.cpp	2011-12-16 17:07:49 +0000
+++ dcpp/ShareManager.cpp	2011-12-17 16:25:32 +0000
@@ -52,7 +52,7 @@
 using std::numeric_limits;
 
 ShareManager::ShareManager() : hits(0), xmlListLen(0), bzXmlListLen(0),
-	xmlDirty(true), forceXmlRefresh(true), refreshDirs(false), update(false), initial(true), listN(0),
+	xmlDirty(true), forceXmlRefresh(true), refreshDirs(false), update(false), initial(true), listN(0), refreshing(false),
 	lastXmlUpdate(0), lastFullUpdate(GET_TICK()), bloom(1<<20)
 {
 	SettingsManager::getInstance()->addListener(this);