From 30da1fd2819fc10193702fcd4e066ecd937731bc Mon Sep 17 00:00:00 2001
From: mariva00 <mariva00@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Thu, 9 Sep 2010 14:51:33 +0000
Subject: [PATCH] Fixes for gcc 4.5
git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2699 5a81b35b-ba03-0410-adc8-b2c5c5119f08
---
modules/gfx/src/scene.cc | 5 -----
modules/gfx/src/scene.hh | 5 ++++-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/modules/gfx/src/scene.cc b/modules/gfx/src/scene.cc
index b5f4bcd60..7afa52997 100644
--- a/modules/gfx/src/scene.cc
+++ b/modules/gfx/src/scene.cc
@@ -472,11 +472,6 @@ void Scene::Unregister(GLWinBase* win)
win_=0;
}
-template <typename ACTION>
-void Scene::NotifyObservers(const ACTION& action) {
- std::for_each(observers_.begin(), observers_.end(), action);
-}
-
namespace {
struct FindNode: public GfxNodeVisitor {
FindNode(const String& n): nam(n), node() {}
diff --git a/modules/gfx/src/scene.hh b/modules/gfx/src/scene.hh
index b1a5fa4ba..87a676055 100644
--- a/modules/gfx/src/scene.hh
+++ b/modules/gfx/src/scene.hh
@@ -350,8 +350,11 @@ protected:
void RenderModeChanged(const String& name);
private:
+
template <typename ACTION>
- void NotifyObservers(const ACTION& action);
+ void NotifyObservers(const ACTION& action) {
+ std::for_each(observers_.begin(), observers_.end(), action);
+ }
Scene();
Scene(const Scene&) {}
Scene& operator=(const Scene&) {return *this;}
--
GitLab