From 7eea241bdbe8cf1ebccb6f8e48d56d24097ae7ab Mon Sep 17 00:00:00 2001 From: David Rose Date: Sat, 15 Sep 2001 00:33:17 +0000 Subject: [PATCH] update for new linux gcc --- panda/src/lerp/lerpfunctor.h | 2 +- panda/src/sgmanip/nodePath.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/panda/src/lerp/lerpfunctor.h b/panda/src/lerp/lerpfunctor.h index 15cdd360c6..9c1eac24b5 100644 --- a/panda/src/lerp/lerpfunctor.h +++ b/panda/src/lerp/lerpfunctor.h @@ -67,7 +67,7 @@ protected: public: virtual ~SimpleLerpFunctor(void); SimpleLerpFunctor& operator=(const SimpleLerpFunctor&); - virtual void operator()(float) = 0; + virtual void operator()(float); PUBLISHED: static TypeHandle get_class_type(void) { diff --git a/panda/src/sgmanip/nodePath.cxx b/panda/src/sgmanip/nodePath.cxx index 84a1f66d8e..94ee789241 100644 --- a/panda/src/sgmanip/nodePath.cxx +++ b/panda/src/sgmanip/nodePath.cxx @@ -2496,7 +2496,7 @@ set_two_sided(bool two_sided, int priority) { //////////////////////////////////////////////////////////////////// bool NodePath:: get_two_sided() const { - nassertr(has_arcs(), NULL); + nassertr(has_arcs(), false); const CullFaceTransition *cft; if (get_transition_into(cft, arc())) { @@ -2642,7 +2642,7 @@ set_transparency(bool transparency, int priority) { //////////////////////////////////////////////////////////////////// bool NodePath:: get_transparency() const { - nassertr(has_arcs(), NULL); + nassertr(has_arcs(), false); const TransparencyTransition *tt; if (get_transition_into(tt, arc())) {