Browse Source

update for new linux gcc

David Rose 24 years ago
parent
commit
7eea241bdb
2 changed files with 3 additions and 3 deletions
  1. 1 1
      panda/src/lerp/lerpfunctor.h
  2. 2 2
      panda/src/sgmanip/nodePath.cxx

+ 1 - 1
panda/src/lerp/lerpfunctor.h

@@ -67,7 +67,7 @@ protected:
 public:
   virtual ~SimpleLerpFunctor(void);
   SimpleLerpFunctor<value>& operator=(const SimpleLerpFunctor<value>&);
-  virtual void operator()(float) = 0;
+  virtual void operator()(float);
 
 PUBLISHED:
   static TypeHandle get_class_type(void) {

+ 2 - 2
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())) {