ports/69782: x11-wm/fluxbox fix for gcc 3.4

[Craig Rodrigues]

>Number:         69782
>Category:       ports
>Synopsis:       x11-wm/fluxbox fix for gcc 3.4
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 30 01:40:26 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Craig Rodrigues
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD dibbler.crodrigues.org 5.2-CURRENT FreeBSD 5.2-CURRENT #23: Thu Jul 29 00:07:59 EDT 2004 rodrigc at dibbler.crodrigues.org:/usr/obj/usr/src/sys/MYKERNEL1 i386


	
>Description:
x11-wm/fluxbox doesn't compile with gcc 3.4.
The attached patch fixes Resource.hh so that things compile.

>How-To-Repeat:
	
>Fix:

	


# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	patch-src-Resource.hh
#
echo x - patch-src-Resource.hh
sed 's/^X//' >patch-src-Resource.hh << 'END-of-patch-src-Resource.hh'
X--- src/Resource.hh.orig	Thu Jul 29 21:04:30 2004
X+++ src/Resource.hh	Thu Jul 29 21:22:14 2004
X@@ -66,16 +66,9 @@
X {
X public:	
X 	Resource(ResourceManager &rm, T val, 
X-	const std::string &name, const std::string &altname):
X-	Resource_base(name, altname),
X-	m_value(val), m_defaultval(val),
X-	m_rm(rm)
X-	{
X-		m_rm.addResource(*this); // add this to resource handler
X-	}
X-	virtual ~Resource() {
X-		m_rm.removeResource(*this); // remove this from resource handler
X-	}
X+	const std::string &name, const std::string &altname);
X+
X+	virtual ~Resource();
X 
X 	inline void setDefaultValue() {  m_value = m_defaultval; }
X 	void setFromString(const char *strval);
X@@ -128,5 +121,18 @@
X 	static bool m_init;
X 	ResourceList m_resourcelist;
X };
X+
X+template <typename T>
X+Resource<T>::Resource(ResourceManager &rm, T val, const std::string &name, 
X+			const std::string &altname):
X+	Resource_base(name, altname), m_value(val), m_defaultval(val), 
X+	m_rm(rm) {
X+                m_rm.addResource(*this); // add this to resource handler
X+}
X+
X+template <typename T>
X+Resource<T>::~Resource() {
X+                m_rm.removeResource(*this); // remove this from resource handler
X+}
X 
X #endif //_RESOURCE_HH_
END-of-patch-src-Resource.hh
exit

>Release-Note:
>Audit-Trail:
>Unformatted: