diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2006-12-21 19:33:08 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2006-12-21 19:33:08 +0000 |
| commit | 9f56acee99307898d179b4d726a47528e8f78cad (patch) | |
| tree | dbb583569bc0f879b6df93000903c1362d7e5e21 /graphics/libx3dtk/files/patch-X3DAbstractNode.h | |
| parent | Update to 1.0.16 (diff) | |
- Fix build with gcc 4.1
PR: ports/106834
Submitted by: German Tischler <tanis@gaspode.franken.de> (maintainer)
Notes
Notes:
svn path=/head/; revision=180363
Diffstat (limited to '')
| -rw-r--r-- | graphics/libx3dtk/files/patch-X3DAbstractNode.h | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/graphics/libx3dtk/files/patch-X3DAbstractNode.h b/graphics/libx3dtk/files/patch-X3DAbstractNode.h index 514290cfbb3a..08b5b23e4254 100644 --- a/graphics/libx3dtk/files/patch-X3DAbstractNode.h +++ b/graphics/libx3dtk/files/patch-X3DAbstractNode.h @@ -1,11 +1,29 @@ *** include/X3DTK/private/X3DAbstractNode.h.orig Fri Aug 27 13:18:33 2004 ---- include/X3DTK/private/X3DAbstractNode.h Sat Oct 29 12:40:12 2005 +--- include/X3DTK/private/X3DAbstractNode.h Sat Dec 16 15:42:01 2006 *************** -*** 133,138 **** ---- 133,148 ---- +*** 102,108 **** + inline void defineTypeName(const SFString &name, const SFString &component = SFString(""), const SFString &sceneGraph = SFString("")) {defineTempTypeName(this, name, component, sceneGraph);}; + /// Method to avoid defineTypeName having a template parameter. + template<class T> +! inline void defineTempTypeName(T *t, const SFString &name, const SFString &component, const SFString &sceneGraph) {define(Recorder<T>::getTypeName(name, component, sceneGraph));}; + /// Defines an attribute. + template<class T, class V> + inline void defineAttribute(const SFString &name, V T:: *member, const V &init); +--- 102,108 ---- + inline void defineTypeName(const SFString &name, const SFString &component = SFString(""), const SFString &sceneGraph = SFString("")) {defineTempTypeName(this, name, component, sceneGraph);}; + /// Method to avoid defineTypeName having a template parameter. + template<class T> +! inline void defineTempTypeName(T * /* t */, const SFString &name, const SFString &component, const SFString &sceneGraph) {define(Recorder<T>::getTypeName(name, component, sceneGraph));}; + /// Defines an attribute. + template<class T, class V> + inline void defineAttribute(const SFString &name, V T:: *member, const V &init); +*************** +*** 132,137 **** +--- 132,147 ---- + /// Removes a parent. bool removeParent(const SFNode &N); }; - ++ + inline void X3DAbstractNode_addParentToChild(SFNode parent, SFNode child) { + X3DAbstractNode::addParentToChild(parent,child); + } @@ -15,7 +33,6 @@ + inline SFType * X3DAbstractNode_getType(X3DAbstractNode * node) { + return node->getType(); + } -+ + } - #include "X3DAbstractNode.inl" |