diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2004-07-30 15:22:55 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2004-07-30 15:22:55 +0000 |
| commit | 02c11edf66f91be669b628aeac6db101b63a74f6 (patch) | |
| tree | 72f2d67fd9e2798481412b19af4c737531644ba9 /x11-wm/fluxbox/files/patch-src-Resource.hh | |
| parent | Update to 1.15 (diff) | |
Fix build with gcc-3.2
Portlint
PR: ports/69782
Submitted by: Craig Rodrigues <rodrigc@crodrigues.org>
Notes
Notes:
svn path=/head/; revision=115087
Diffstat (limited to '')
| -rw-r--r-- | x11-wm/fluxbox/files/patch-src-Resource.hh | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/x11-wm/fluxbox/files/patch-src-Resource.hh b/x11-wm/fluxbox/files/patch-src-Resource.hh new file mode 100644 index 000000000000..7e854873b332 --- /dev/null +++ b/x11-wm/fluxbox/files/patch-src-Resource.hh @@ -0,0 +1,41 @@ +--- src/Resource.hh.orig Thu Jul 29 21:04:30 2004 ++++ src/Resource.hh Thu Jul 29 21:22:14 2004 +@@ -66,16 +66,9 @@ + { + public: + Resource(ResourceManager &rm, T val, +- const std::string &name, const std::string &altname): +- Resource_base(name, altname), +- m_value(val), m_defaultval(val), +- m_rm(rm) +- { +- m_rm.addResource(*this); // add this to resource handler +- } +- virtual ~Resource() { +- m_rm.removeResource(*this); // remove this from resource handler +- } ++ const std::string &name, const std::string &altname); ++ ++ virtual ~Resource(); + + inline void setDefaultValue() { m_value = m_defaultval; } + void setFromString(const char *strval); +@@ -128,5 +121,18 @@ + static bool m_init; + ResourceList m_resourcelist; + }; ++ ++template <typename T> ++Resource<T>::Resource(ResourceManager &rm, T val, const std::string &name, ++ const std::string &altname): ++ Resource_base(name, altname), m_value(val), m_defaultval(val), ++ m_rm(rm) { ++ m_rm.addResource(*this); // add this to resource handler ++} ++ ++template <typename T> ++Resource<T>::~Resource() { ++ m_rm.removeResource(*this); // remove this from resource handler ++} + + #endif //_RESOURCE_HH_ |