linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3212
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Mon 2013-03-04 00:23:07 +0100
message:
  build fixes
modified:
  dcpp/CriticalSection.h
  dcpp/DirectoryListing.h
  dcpp/HintedUser.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/CriticalSection.h'
--- dcpp/CriticalSection.h	2013-01-18 21:28:38 +0000
+++ dcpp/CriticalSection.h	2013-03-03 23:23:07 +0000
@@ -19,6 +19,7 @@
 #ifndef DCPLUSPLUS_DCPP_CRITICAL_SECTION_H
 #define DCPLUSPLUS_DCPP_CRITICAL_SECTION_H
 
+#include <boost/thread/lock_guard.hpp>
 #include <boost/thread/recursive_mutex.hpp>
 
 namespace dcpp {

=== modified file 'dcpp/DirectoryListing.h'
--- dcpp/DirectoryListing.h	2013-01-18 21:28:38 +0000
+++ dcpp/DirectoryListing.h	2013-03-03 23:23:07 +0000
@@ -48,11 +48,14 @@
 		typedef File* Ptr;
 
 		File(Directory* aDir, const string& aName, int64_t aSize, const TTHValue& aTTH) noexcept :
+			boost::noncopyable(),
 			name(aName), size(aSize), parent(aDir), tthRoot(aTTH), adls(false)
 		{
 		}
 
-		File(const File& rhs, bool _adls = false) : name(rhs.name), size(rhs.size), parent(rhs.parent), tthRoot(rhs.tthRoot), adls(_adls)
+		File(const File& rhs, bool _adls = false) :
+			boost::noncopyable(),
+			name(rhs.name), size(rhs.size), parent(rhs.parent), tthRoot(rhs.tthRoot), adls(_adls)
 		{
 		}
 
@@ -78,8 +81,9 @@
 		set<Ptr, Less<Directory>> directories;
 		set<File::Ptr, Less<File>> files;
 
-		Directory(Directory* aParent, const string& aName, bool _adls, bool aComplete)
-			: name(aName), parent(aParent), adls(_adls), complete(aComplete) { }
+		Directory(Directory* aParent, const string& aName, bool _adls, bool aComplete) :
+			boost::noncopyable(),
+			name(aName), parent(aParent), adls(_adls), complete(aComplete) { }
 
 		virtual ~Directory();
 

=== modified file 'dcpp/HintedUser.h'
--- dcpp/HintedUser.h	2013-02-03 22:26:48 +0000
+++ dcpp/HintedUser.h	2013-03-03 23:23:07 +0000
@@ -49,7 +49,7 @@
 
 	operator UserPtr() const { return user; }
 
-	explicit operator bool() const { return user; }
+	explicit operator bool() const { return user.get(); }
 };
 
 }