Fix GCC 3.4+ issues: template instantiation, cast of reference

parameters.

4 files changed, 72 insertions, 1 deletions

diff --git a/wm/openbox2/distinfo b/wm/openbox2/distinfo
index 943624c017e..711a57bef18 100644
--- a/wm/openbox2/distinfo
+++ b/wm/openbox2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:43:55 wiz Exp $
+$NetBSD: distinfo,v 1.3 2006/01/02 22:05:38 joerg Exp $
 
 SHA1 (openbox-2.2.3.tar.gz) = 972b7b62ced97dcdcc05be0038f3c929765f8fde
 RMD160 (openbox-2.2.3.tar.gz) = 160a45583e4241041eff382f86929cc8bb12c803
@@ -7,3 +7,6 @@ SHA1 (patch-aa) = 0e52e4bd1c8b0d053b9b7734871aeb924b89f82a
 SHA1 (patch-ab) = 210b3cb925b7a0b1441c4dfa87760a9c97bb249c
 SHA1 (patch-ac) = f7b406216366e5f177ac8dc8516dd0c6066bc01f
 SHA1 (patch-ad) = e651f30ad0ab1843807c33bff474f8b5ee66d68d
+SHA1 (patch-ae) = 0e919952cd5209e787807548ca7ce45c5ed03497
+SHA1 (patch-af) = 1d8c1140948568668f509d75f00314d01dcb269c
+SHA1 (patch-ag) = 2aa89df82cebe06e0cf7837b6b62eb089b96ecfd
diff --git a/wm/openbox2/patches/patch-ae b/wm/openbox2/patches/patch-ae
new file mode 100644
index 00000000000..61237e7e693
--- /dev/null
+++ b/wm/openbox2/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2006/01/02 22:05:38 joerg Exp $
+
+--- src/Timer.hh.orig	2006-01-02 21:42:01.000000000 +0000
++++ src/Timer.hh
+@@ -98,9 +98,9 @@ public:
+   ~_timer_queue(void) {}
+ 
+   void release(const _Tp& value) {
+-    c.erase(std::remove(c.begin(), c.end(), value), c.end());
++    this->c.erase(std::remove(this->c.begin(), this->c.end(), value), this->c.end());
+     // after removing the item we need to make the heap again
+-    std::make_heap(c.begin(), c.end(), comp);
++    std::make_heap(this->c.begin(), this->c.end(), this->comp);
+   }
+   bool empty(void) const { return _Base::empty(); }
+   size_t size(void) const { return _Base::size(); }
diff --git a/wm/openbox2/patches/patch-af b/wm/openbox2/patches/patch-af
new file mode 100644
index 00000000000..ad3d6099da9
--- /dev/null
+++ b/wm/openbox2/patches/patch-af
@@ -0,0 +1,18 @@
+$NetBSD: patch-af,v 1.1 2006/01/02 22:05:38 joerg Exp $
+
+--- util/epist/window.cc.orig	2006-01-02 21:54:28.000000000 +0000
++++ util/epist/window.cc
+@@ -166,9 +166,12 @@ void XWindow::updateState() {
+ 
+ 
+ void XWindow::updateDesktop() {
++  unsigned long tmp_desktop = _desktop;
+   if (! _xatom->getValue(_window, XAtom::net_wm_desktop, XAtom::cardinal,
+-                         static_cast<unsigned long>(_desktop)))
++                         tmp_desktop))
+     _desktop = 0;
++  else
++    _desktop = tmp_desktop;
+ }
+ 
+ 
diff --git a/wm/openbox2/patches/patch-ag b/wm/openbox2/patches/patch-ag
new file mode 100644
index 00000000000..48ed38fae9e
--- /dev/null
+++ b/wm/openbox2/patches/patch-ag
@@ -0,0 +1,34 @@
+$NetBSD: patch-ag,v 1.1 2006/01/02 22:05:38 joerg Exp $
+
+--- util/epist/screen.cc.orig	2006-01-02 21:58:13.000000000 +0000
++++ util/epist/screen.cc
+@@ -435,19 +435,27 @@ void screen::updateEverything() {
+ void screen::updateNumDesktops() {
+   assert(_managed);
+ 
++  unsigned long tmp_num_desktops = _num_desktops;
++
+   if (! _xatom->getValue(_root, XAtom::net_number_of_desktops, XAtom::cardinal,
+-                         (unsigned long)_num_desktops))
++                         tmp_num_desktops))
+     _num_desktops = 1;  // assume that there is at least 1 desktop!
++  else
++    _num_desktops = tmp_num_desktops;
+ }
+ 
+ 
+ void screen::updateActiveDesktop() {
+   assert(_managed);
+ 
++  unsigned long tmp_active_desktop = _active_desktop;
++
+   if (! _xatom->getValue(_root, XAtom::net_current_desktop, XAtom::cardinal,
+-                         (unsigned long)_active_desktop))
++                         tmp_active_desktop))
+     _active_desktop = 0;  // there must be at least one desktop, and it must
+                           // be the current one
++  else
++    _active_desktop = tmp_active_desktop;
+ }
+ 
+