From 1ae62b2f19af4cca60ceef5eb9d8af5188313d6f Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 5 May 2005 19:46:04 +0000 Subject: [PATCH] Changed check() method name to checkConsistency() to avoid perculiar OSX Tiger build error. --- applications/osgconv/GNUmakefile | 2 ++ applications/osgconv/GeoSet.cpp | 2 +- applications/osgconv/GeoSet.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/applications/osgconv/GNUmakefile b/applications/osgconv/GNUmakefile index 5b003f20d..2473a2e2f 100644 --- a/applications/osgconv/GNUmakefile +++ b/applications/osgconv/GNUmakefile @@ -19,4 +19,6 @@ INSTFILES = \ EXEC = osgconv +INC += $(X_INC) + include $(TOPDIR)/Make/makerules diff --git a/applications/osgconv/GeoSet.cpp b/applications/osgconv/GeoSet.cpp index c6b7f1c60..6eeb7c3cd 100644 --- a/applications/osgconv/GeoSet.cpp +++ b/applications/osgconv/GeoSet.cpp @@ -531,7 +531,7 @@ bool GeoSet::computeBound() const return true; } -bool GeoSet::check() const +bool GeoSet::checkConsistency() const { if( _coords == (Vec3 *)0 ) return false; diff --git a/applications/osgconv/GeoSet.h b/applications/osgconv/GeoSet.h index aabda2243..ef73508df 100644 --- a/applications/osgconv/GeoSet.h +++ b/applications/osgconv/GeoSet.h @@ -316,7 +316,7 @@ class GeoSet : public Drawable */ virtual void drawImplementation(State&) const {} - bool check() const; + bool checkConsistency() const; /** function object which is used to handling the clean up of attribute arrays