rpms/obby/devel obby-0.4.0rc2-gcc41.patch, NONE, 1.1 obby.spec, 1.17, 1.18

[Paul Nasrat (pnasrat)]

Author: pnasrat

Update of /cvs/extras/rpms/obby/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22782

Modified Files:
	obby.spec 
Added Files:
	obby-0.4.0rc2-gcc41.patch 
Log Message:
Fix build for gcc41

obby-0.4.0rc2-gcc41.patch:

--- NEW FILE obby-0.4.0rc2-gcc41.patch ---
--- obby-0.4.0rc2/inc/server_buffer.hpp.gcc41	2006-05-18 13:29:01.000000000 -0400
+++ obby-0.4.0rc2/inc/server_buffer.hpp	2006-07-12 14:21:15.000000000 -0400
@@ -485,7 +485,7 @@
 	if(m_enable_keepalives == enable) return;
 
 	m_enable_keepalives = enable;
-	user_table& table = basic_buffer<Document, Selector>::m_user_table;
+	user_table& table = this->m_user_table;
 
 	for(user_table::iterator iter =
 		table.begin(user::flags::CONNECTED, user::flags::NONE);
@@ -1076,7 +1076,7 @@
 	on_command_emote(const user& from,
 	                 const std::string& paramlist)
 {
-	user_table& table = basic_buffer<Document, Selector>::m_user_table;
+	user_table& table = this->m_user_table;
 
 	net6::packet pack("obby_emote_message");
 	pack << &from << paramlist;
@@ -1112,7 +1112,7 @@
 void basic_server_buffer<Document, Selector>::session_close_impl()
 {
 	// Session is closed, so all users have quit
-	user_table& table = basic_buffer<Document, Selector>::m_user_table;
+	user_table& table = this->m_user_table;
 
 	for(user_table::iterator iter =
 		table.begin(user::flags::CONNECTED, user::flags::NONE);
--- obby-0.4.0rc2/inc/local_buffer.hpp.gcc41	2006-05-18 13:29:01.000000000 -0400
+++ obby-0.4.0rc2/inc/local_buffer.hpp	2006-07-12 14:21:15.000000000 -0400
@@ -151,7 +151,7 @@
 void basic_local_buffer<Document, Selector>::session_close_impl()
 {
 	// Remove all users except for the local one
-	user_table& table = basic_buffer<Document, Selector>::m_user_table;
+	user_table& table = this->m_user_table;
 
 	for(user_table::iterator iter =
 		table.begin(user::flags::CONNECTED, user::flags::NONE);
--- obby-0.4.0rc2/inc/host_buffer.hpp.gcc41	2006-05-18 13:29:01.000000000 -0400
+++ obby-0.4.0rc2/inc/host_buffer.hpp	2006-07-12 14:21:15.000000000 -0400
@@ -341,7 +341,7 @@
 template<typename Document, typename Selector>
 void basic_host_buffer<Document, Selector>::init_impl()
 {
-	user_table& table = basic_buffer<Document, Selector>::m_user_table;
+	user_table& table = this->m_user_table;
 	table.deserialised_event().connect(
 		sigc::mem_fun(
 			*this,
--- obby-0.4.0rc2/inc/buffer.hpp.gcc41	2006-05-18 13:29:01.000000000 -0400
+++ obby-0.4.0rc2/inc/buffer.hpp	2006-07-12 14:21:15.000000000 -0400
@@ -270,9 +270,6 @@
 typedef basic_buffer<obby::document, net6::selector> buffer;
 
 template<typename Document, typename Selector>
-const unsigned long basic_buffer<Document, Selector>::PROTOCOL_VERSION = 8ul;
-
-template<typename Document, typename Selector>
 basic_buffer<Document, Selector>::basic_buffer():
 	m_chat(*this, 0xff),
 	m_doc_counter(0), m_package(obby_package(), obby_localedir())
--- obby-0.4.0rc2/src/buffer.cpp.gcc41	2006-05-18 13:29:00.000000000 -0400
+++ obby-0.4.0rc2/src/buffer.cpp	2006-07-12 14:21:15.000000000 -0400
@@ -17,3 +17,11 @@
  */
 
 #include "buffer.hpp"
+
+namespace obby {
+
+template<typename Document, typename Selector>
+const unsigned long basic_buffer<Document, Selector>::PROTOCOL_VERSION = 8ul;
+
+} // namespace obby
+


Index: obby.spec
===================================================================
RCS file: /cvs/extras/rpms/obby/devel/obby.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- obby.spec	16 Jun 2006 14:42:17 -0000	1.17
+++ obby.spec	12 Jul 2006 18:27:55 -0000	1.18
@@ -2,13 +2,14 @@
 
 Name:           obby
 Version:        0.4.0
-Release:        3.%{_rc}%{?dist}
+Release:        4.%{_rc}%{?dist}
 Summary:        A library which provides synced document buffers
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://releases.0x539.de/obby
 Source0:        http://releases.0x539.de/obby/%{name}-%{version}%{_rc}.tar.gz
+Patch0:		%{name}-%{version}%{_rc}-gcc41.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  net6-devel, gmp-devel, gettext-devel
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{_rc}
+%patch0 -p1 -b .gcc41
 
 
 %build
@@ -67,6 +69,10 @@
 
 
 %changelog
+* Wed Jul 12 2006 Paul Nasrat <pnasrat at redhat.com> - 0.4.0-4.rc2
+- GCC 4.1 fixes from Debian Experimental package
+- http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=375193
+
 * Fri Jun 16 2006 Luke Macken <lmacken at redhat.com> - 0.4.0-3.rc2
 - Rebuild