Do not rely on std::endl function address and fix warnings

examples/osgframerenderer/CaptureSettings.cpp

@@ -104,12 +104,12 @@ static bool writeEventHandlers( osgDB::OutputStream& os, const gsc::CaptureSetti
 {
     const gsc::CaptureSettings::EventHandlers& pl = cs.getEventHandlers();
     unsigned int size = pl.size();
-    os << size << os.BEGIN_BRACKET << std::endl;
+    os << size << os.BEGIN_BRACKET << osgDB::OutputStream::Endl{};
     for ( unsigned int i=0; i<size; ++i )
     {
         os << pl[i].get();
     }
-    os << os.END_BRACKET << std::endl;
+    os << os.END_BRACKET << osgDB::OutputStream::Endl{};
     return true;
 }
 
@@ -135,12 +135,12 @@ static bool writeProperties( osgDB::OutputStream& os, const gsc::CaptureSettings
 {
     const gsc::CaptureSettings::Properties& pl = cs.getProperties();
     unsigned int size = pl.size();
-    os << size << os.BEGIN_BRACKET << std::endl;
+    os << size << os.BEGIN_BRACKET << osgDB::OutputStream::Endl{};
     for ( unsigned int i=0; i<size; ++i )
     {
         os << pl[i].get();
     }
-    os << os.END_BRACKET << std::endl;
+    os << os.END_BRACKET << osgDB::OutputStream::Endl{};
     return true;
 }
 

include/osg/Plane

@@ -241,15 +241,13 @@ class OSG_EXPORT Plane
 
             int noAbove = 0;
             int noBelow = 0;
-            int noOn = 0;
             for(std::vector<Vec3f>::const_iterator itr=vertices.begin();
                 itr != vertices.end();
                 ++itr)
             {
                 float d = distance(*itr);
                 if (d>0.0f) ++noAbove;
                 else if (d<0.0f) ++noBelow;
-                else ++noOn;
             }
 
             if (noAbove>0)
@@ -270,15 +268,13 @@ class OSG_EXPORT Plane
 
             int noAbove = 0;
             int noBelow = 0;
-            int noOn = 0;
             for(std::vector<Vec3d>::const_iterator itr=vertices.begin();
                 itr != vertices.end();
                 ++itr)
             {
                 double d = distance(*itr);
                 if (d>0.0) ++noAbove;
                 else if (d<0.0) ++noBelow;
-                else ++noOn;
             }
 
             if (noAbove>0)

include/osgDB/OutputStream

@@ -76,6 +76,8 @@ public:
         WRITE_EXTERNAL_FILE        /*!< Write Image::data() to disk and use it as external file */
     };
 
+    struct Endl {};
+
     OutputStream( const osgDB::Options* options );
     virtual ~OutputStream();
 
@@ -108,6 +110,7 @@ public:
     OutputStream& operator<<( const char* s ) { _out->writeString(s); return *this; }
     OutputStream& operator<<( std::ostream& (*fn)(std::ostream&) ) { _out->writeStream(fn); return *this; }
     OutputStream& operator<<( std::ios_base& (*fn)(std::ios_base&) ) { _out->writeBase(fn); return *this; }
+    OutputStream& operator<<( Endl ) { _out->writeEndl(); return *this; }
 
     OutputStream& operator<<( const ObjectGLenum& value ) { _out->writeGLenum(value); return *this; }
     OutputStream& operator<<( const ObjectProperty& prop ) { _out->writeProperty(prop); return *this; }

include/osgDB/Serializer

@@ -314,7 +314,7 @@ public:
             if ( _useHex ) { os << std::hex << std::showbase; }
             os << value;
             if ( _useHex ) os << std::dec << std::noshowbase;
-            os << std::endl;
+            os << OutputStream::Endl{};
         }
         return true;
     }
@@ -368,7 +368,7 @@ public:
         }
         else if ( ParentType::_defaultValue!=value )
         {
-            os << os.PROPERTY((ParentType::_name).c_str()) << value << std::endl;
+            os << os.PROPERTY((ParentType::_name).c_str()) << value << OutputStream::Endl{};
         }
         return true;
     }
@@ -419,7 +419,7 @@ public:
         }
         else if ( ParentType::_defaultValue!=value )
         {
-            os << os.PROPERTY((ParentType::_name).c_str()) << value << std::endl;
+            os << os.PROPERTY((ParentType::_name).c_str()) << value << OutputStream::Endl{};
         }
         return true;
     }
@@ -487,7 +487,7 @@ public:
         }
         else if ( ParentType::_defaultValue!=value )
         {
-            os << os.PROPERTY((ParentType::_name).c_str()) << GLENUM(value) << std::endl;
+            os << os.PROPERTY((ParentType::_name).c_str()) << GLENUM(value) << OutputStream::Endl{};
         }
         return true;
     }
@@ -540,7 +540,7 @@ public:
         {
             os << os.PROPERTY((ParentType::_name).c_str());
             os.writeWrappedString( value );
-            os << std::endl;
+            os << OutputStream::Endl{};
         }
         return true;
     }
@@ -614,11 +614,11 @@ public:
             os << os.PROPERTY(_name.c_str()) << hasObject;
             if ( hasObject )
             {
-                os << os.BEGIN_BRACKET << std::endl;
+                os << os.BEGIN_BRACKET << OutputStream::Endl{};
                 os.writeObject( value );
                 os << os.END_BRACKET;
             }
-            os << std::endl;
+            os << OutputStream::Endl{};
         }
         return true;
     }
@@ -691,11 +691,11 @@ public:
             os << os.PROPERTY((ParentType::_name).c_str()) << hasObject;
             if ( hasObject )
             {
-                os << os.BEGIN_BRACKET << std::endl;
+                os << os.BEGIN_BRACKET << OutputStream::Endl{};
                 os.writeImage( value );
                 os << os.END_BRACKET;
             }
-            os << std::endl;
+            os << OutputStream::Endl{};
         }
         return true;
     }
@@ -756,7 +756,7 @@ public:
         }
         else if ( ParentType::_defaultValue!=value )
         {
-            os << os.PROPERTY((ParentType::_name).c_str()) << getString(value) << std::endl;
+            os << os.PROPERTY((ParentType::_name).c_str()) << getString(value) << OutputStream::Endl{};
         }
         return true;
     }
@@ -836,14 +836,14 @@ public:
         }
         else if ( size>0 )
         {
-            os << os.PROPERTY((_name).c_str()) << size << os.BEGIN_BRACKET << std::endl;
+            os << os.PROPERTY((_name).c_str()) << size << os.BEGIN_BRACKET << OutputStream::Endl{};
             for ( ConstIterator itr=list.begin();
                   itr!=list.end(); ++itr )
             {
                 os << (*itr);
             }
-            os << std::endl;
-            os << os.END_BRACKET << std::endl;
+            os << OutputStream::Endl{};
+            os << os.END_BRACKET << OutputStream::Endl{};
         }
         return true;
     }
@@ -1011,7 +1011,7 @@ public:
         }
         else if ( size>0 )
         {
-            os << os.PROPERTY((_name).c_str()) << size << os.BEGIN_BRACKET << std::endl;
+            os << os.PROPERTY((_name).c_str()) << size << os.BEGIN_BRACKET << OutputStream::Endl{};
             if (_numElementsOnRow==0)
             {
                 for ( ConstIterator itr=list.begin(); itr!=list.end(); ++itr )
@@ -1023,7 +1023,7 @@ public:
             {
                 for ( ConstIterator itr=list.begin(); itr!=list.end(); ++itr )
                 {
-                    os << (*itr); os << std::endl;
+                    os << (*itr); os << OutputStream::Endl{};
                 }
             }
             else
@@ -1032,12 +1032,12 @@ public:
                 for (ConstIterator itr=list.begin(); itr!=list.end(); ++itr)
                 {
                     os << (*itr);
-                    if (i==0) { os << std::endl; i = _numElementsOnRow-1; }
+                    if (i==0) { os << OutputStream::Endl{}; i = _numElementsOnRow-1; }
                     else --i;
                 }
-                if (i!=_numElementsOnRow) os << std::endl;
+                if (i!=_numElementsOnRow) os << OutputStream::Endl{};
             }
-            os << os.END_BRACKET << std::endl;
+            os << os.END_BRACKET << OutputStream::Endl{};
         }
         return true;
     }
@@ -1165,7 +1165,7 @@ public:
         }
         else if ( size>0 )
         {
-            os << os.PROPERTY((_name).c_str()) << size << os.BEGIN_BRACKET << std::endl;
+            os << os.PROPERTY((_name).c_str()) << size << os.BEGIN_BRACKET << OutputStream::Endl{};
             if (_numElementsOnRow==0)
             {
                 for ( ConstIterator itr=list.begin(); itr!=list.end(); ++itr )
@@ -1177,7 +1177,7 @@ public:
             {
                 for ( ConstIterator itr=list.begin(); itr!=list.end(); ++itr )
                 {
-                    os << (*itr); os << std::endl;
+                    os << (*itr); os << OutputStream::Endl{};
                 }
             }
             else
@@ -1186,12 +1186,12 @@ public:
                 for (ConstIterator itr=list.begin(); itr!=list.end(); ++itr)
                 {
                     os << (*itr);
-                    if (i==0) { os << std::endl; i = _numElementsOnRow-1; }
+                    if (i==0) { os << OutputStream::Endl{}; i = _numElementsOnRow-1; }
                     else --i;
                 }
-                if (i!=_numElementsOnRow) os << std::endl;
+                if (i!=_numElementsOnRow) os << OutputStream::Endl{};
             }
-            os << os.END_BRACKET << std::endl;
+            os << os.END_BRACKET << OutputStream::Endl{};
         }
         return true;
     }
@@ -1431,12 +1431,12 @@ public:
         }
         else if ( size>0 )
         {
-            os << os.PROPERTY((_name).c_str()) << size << os.BEGIN_BRACKET << std::endl;
+            os << os.PROPERTY((_name).c_str()) << size << os.BEGIN_BRACKET << OutputStream::Endl{};
             for ( ConstIterator itr=map.begin(); itr!=map.end(); ++itr )
             {
-                os << itr->first << itr->second; os << std::endl;
+                os << itr->first << itr->second; os << OutputStream::Endl{};
             }
-            os << os.END_BRACKET << std::endl;
+            os << os.END_BRACKET << OutputStream::Endl{};
         }
         return true;
     }
@@ -1531,7 +1531,7 @@ public:
             if ( !maskString.size() )
                 maskString = std::string("NONE|");
             maskString.erase(maskString.size()-1,1);
-            os << maskString << std::endl; //remove last "|"
+            os << maskString << OutputStream::Endl{}; //remove last "|"
         }
         return true;
     }

include/osgDB/StreamOperator

@@ -49,6 +49,7 @@ public:
     virtual void writeString( const std::string& s ) = 0;
     virtual void writeStream( std::ostream& (*fn)(std::ostream&) ) = 0;
     virtual void writeBase( std::ios_base& (*fn)(std::ios_base&) ) = 0;
+    virtual void writeEndl() = 0;
 
     virtual void writeGLenum( const ObjectGLenum& value ) = 0;
     virtual void writeProperty( const ObjectProperty& prop ) = 0;
@@ -59,21 +60,6 @@ public:
     virtual void flush() { _out->flush(); }
 
 protected:
-    // Return true if the manipulator is std::endl
-    bool isEndl( std::ostream& (*fn)(std::ostream&) )
-    {
-#if defined (__sun) || (defined _WIN32 && !defined OSG_LIBRARY_STATIC)
-        // What a mess, but solaris does not like taking the address below
-        // windows std::endl is a template with different adresses in different dll's
-        std::stringstream ss;
-        ss << fn;
-        std::string s = ss.str();
-        return !s.empty() && s[0] == '\n';
-#else
-        return fn==static_cast<std::ostream& (*)(std::ostream&)>(std::endl);
-#endif
-    }
-
     std::ostream* _out;
     osgDB::OutputStream* _outputStream;
     bool _supportBinaryBrackets;

src/osg/dxtctool.cpp

@@ -1,6 +1,6 @@
 // dxtctool.cpp: implementation of DXTC Tools functions.
 //
-// Copyright (C) 2002 Tanguy Fautr�.
+// Copyright (C) 2002 Tanguy Fautré.
 // For conditions of distribution and use,
 // see copyright notice in dxtctool.h
 //

src/osg/dxtctool.h

@@ -2,7 +2,7 @@
 //
 //////////////////////////////////////////////////////////////////////
 //
-//  Copyright (C) 2002 Tanguy Fautr.
+//  Copyright (C) 2002 Tanguy Fautré.
 //
 //  This software is provided 'as-is', without any express or implied
 //  warranty.  In no event will the authors be held liable for any damages

src/osgDB/ClassInterface.cpp

@@ -63,6 +63,7 @@ class PropertyOutputIterator : public osgDB::OutputIterator
     virtual void writeString( const std::string& s ) { _str.insert(_str.end(), s.begin(), s.end()); }
     virtual void writeStream( std::ostream& (*)(std::ostream&) ) {}
     virtual void writeBase( std::ios_base& (*)(std::ios_base&) ) {}
+    virtual void writeEndl() {}
     virtual void writeGLenum( const osgDB::ObjectGLenum& value ) { writeInt(value.get()); }
     virtual void writeProperty( const osgDB::ObjectProperty& prop ) { _propertyName = prop._name; }
     virtual void writeMark( const osgDB::ObjectMark& mark ) { _markName = mark._name; }