From b9d4baf415162b7049a46ba82fb651fbda6661be Mon Sep 17 00:00:00 2001
From: Andreas Schenk <andreas_schenk@hms.harvard.edu>
Date: Tue, 18 Sep 2012 18:22:03 -0400
Subject: [PATCH] fixed two infinite recursions
---
modules/gfx/src/gfx_node.cc | 2 +-
modules/mol/base/src/chem_type.hh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/gfx/src/gfx_node.cc b/modules/gfx/src/gfx_node.cc
index 8d417aeec..813ce6f41 100644
--- a/modules/gfx/src/gfx_node.cc
+++ b/modules/gfx/src/gfx_node.cc
@@ -141,7 +141,7 @@ bool GfxNode::IsAttachedToScene() const
void GfxNode::Add(GfxObjP obj)
{
GfxNodeP node=obj;
- this->Add(obj);
+ this->Add(node);
}
void GfxNode::Remove(GfxObjP obj)
diff --git a/modules/mol/base/src/chem_type.hh b/modules/mol/base/src/chem_type.hh
index eac806433..ff3a6b059 100644
--- a/modules/mol/base/src/chem_type.hh
+++ b/modules/mol/base/src/chem_type.hh
@@ -52,7 +52,7 @@ struct ChemType {
}
bool operator!=(const ChemType& cc) const {
- return this->operator!=(cc);
+ return cc.chem_type_!=chem_type_;
}
bool IsIon() const {
--
GitLab