[Dcplusplus-commit] dcplusplus/client AdcCommand.h,1.27,1.28 BufferedSocket.h,1.76,1.77 Makefile.am,1.8,1.9 Pointer.h,1.20,1.21 User.cpp,1.52,1.53 User.h,1.69,1.70

[Jacek S. <arn...@us...>]

Update of /cvsroot/dcplusplus/dcplusplus/client
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4479/client

Modified Files:
	AdcCommand.h BufferedSocket.h Makefile.am Pointer.h User.cpp 
	User.h 
Log Message:
A few pedantry fixes

Index: BufferedSocket.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/BufferedSocket.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** BufferedSocket.h	12 Feb 2006 18:16:12 -0000	1.76
--- BufferedSocket.h	17 Feb 2006 19:23:51 -0000	1.77
***************
*** 133,137 ****
  	};
  
! 	BufferedSocket(char aSeparator) throw(ThreadException);
  
  	// Dummy...
--- 133,137 ----
  	};
  
! 	BufferedSocket(char aSeparator) throw();
  
  	// Dummy...

Index: User.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/User.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** User.cpp	29 Jan 2006 18:48:25 -0000	1.52
--- User.cpp	17 Feb 2006 19:23:51 -0000	1.53
***************
*** 24,28 ****
  #include "StringTokenizer.h"
  
! OnlineUser::OnlineUser(const User::Ptr& ptr, Client& client_, u_int32_t sid_) : user(ptr), identity(ptr, client_.getHubUrl()), client(&client_), sid(sid_) { 
  
  }
--- 24,28 ----
  #include "StringTokenizer.h"
  
! OnlineUser::OnlineUser(const User::Ptr& ptr, Client& client_, u_int32_t sid_) : user(ptr), identity(ptr, client_.getHubUrl()), sid(sid_), client(&client_) { 
  
  }

Index: AdcCommand.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/AdcCommand.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** AdcCommand.h	12 Feb 2006 18:16:12 -0000	1.27
--- AdcCommand.h	17 Feb 2006 19:23:51 -0000	1.28
***************
*** 99,103 ****
  #undef C
  
! 	static const HUB_SID = 0x41414141;		// AAAA in base32
  
  	explicit AdcCommand(u_int32_t aCmd, char aType = TYPE_CLIENT);
--- 99,103 ----
  #undef C
  
! 	static const u_int32_t HUB_SID = 0x41414141;		// AAAA in base32
  
  	explicit AdcCommand(u_int32_t aCmd, char aType = TYPE_CLIENT);

Index: Makefile.am
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile.am	16 Dec 2005 01:00:46 -0000	1.8
--- Makefile.am	17 Feb 2006 19:23:51 -0000	1.9
***************
*** 123,129 ****
  pch: stdinc.h.gch
  
  stdinc.h.gch: stdinc.h
!     $(CXX) $(venus_CXXFLAGS) $(CXXFLAGS) $?
  
- .PHONY: pch
- 	
--- 123,129 ----
  pch: stdinc.h.gch
  
+ BUILT_SOURCES = stdinc.h.gch
+ 
  stdinc.h.gch: stdinc.h
! 	$(CXX) $(libdcppclient_la_CXXFLAGS) $(CXXFLAGS) $?
  

Index: User.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/User.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** User.h	29 Jan 2006 18:48:25 -0000	1.69
--- User.h	17 Feb 2006 19:23:51 -0000	1.70
***************
*** 100,104 ****
  	Identity() { }
  	Identity(const User::Ptr& ptr, const string& aHubUrl) : user(ptr), hubUrl(aHubUrl) { }
! 	Identity(const Identity& rhs) : user(rhs.user), hubUrl(rhs.hubUrl), info(rhs.info) { }
  	Identity& operator=(const Identity& rhs) { user = rhs.user; hubUrl = rhs.hubUrl; info = rhs.info; return *this; }
  
--- 100,104 ----
  	Identity() { }
  	Identity(const User::Ptr& ptr, const string& aHubUrl) : user(ptr), hubUrl(aHubUrl) { }
! 	Identity(const Identity& rhs) : ::Flags(rhs), user(rhs.user), hubUrl(rhs.hubUrl), info(rhs.info) { }
  	Identity& operator=(const Identity& rhs) { user = rhs.user; hubUrl = rhs.hubUrl; info = rhs.info; return *this; }
  
***************
*** 163,167 ****
  	typedef List::iterator Iter;
  
! 	OnlineUser() : client(NULL), sid(0) { }
  	OnlineUser(const User::Ptr& ptr, Client& client_, u_int32_t sid_);
  
--- 163,167 ----
  	typedef List::iterator Iter;
  
! 	OnlineUser() : sid(0), client(NULL) { }
  	OnlineUser(const User::Ptr& ptr, Client& client_, u_int32_t sid_);
  

Index: Pointer.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/Pointer.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Pointer.h	1 Jan 2006 22:42:54 -0000	1.20
--- Pointer.h	17 Feb 2006 19:23:51 -0000	1.21
***************
*** 160,164 ****
  struct DeleteFunction {
  	template<typename T>
! 	void operator()(const T& p) const { delete p; };
  };
  
--- 160,164 ----
  struct DeleteFunction {
  	template<typename T>
! 	void operator()(const T& p) const { delete p; }
  };