two warning fixes

diff --git a/simgear/scene/util/StateAttributeFactory.cxx b/simgear/scene/util/StateAttributeFactory.cxx
index 76124da06b1b1e8df83ca8f024928d979f91ff38..25a0a57622860f841105ebd9985de3613682c220 100644 (file)
--- a/simgear/scene/util/StateAttributeFactory.cxx
+++ b/simgear/scene/util/StateAttributeFactory.cxx
@@ -39,7 +39,7 @@ StateAttributeFactory::StateAttributeFactory()
 {
     _standardAlphaFunc = new AlphaFunc;
     _standardAlphaFunc->setFunction(osg::AlphaFunc::GREATER);
-    _standardAlphaFunc->setReferenceValue(0.01);
+    _standardAlphaFunc->setReferenceValue(0.01f);
     _standardAlphaFunc->setDataVariance(Object::STATIC);
     _smooth = new ShadeModel;
     _smooth->setMode(ShadeModel::SMOOTH);

diff --git a/simgear/structure/SGSharedPtr.hxx b/simgear/structure/SGSharedPtr.hxx
index f321b12dc4a3e4578b14276d2e5f74dfded32b2c..98b72f22c902a37dfd43c07b2f8418a36687ebbe 100644 (file)
--- a/simgear/structure/SGSharedPtr.hxx
+++ b/simgear/structure/SGSharedPtr.hxx
@@ -88,7 +88,7 @@ public:
   { return T::count(_ptr); }
 
   bool valid(void) const
-  { return _ptr; }
+  { return _ptr != NULL; }
 
   void clear()
   { put(); }