Final tag for 2.8.4. Renaming release candidate 3 as the final release.

CMakeLists.txt

@@ -30,7 +30,7 @@ PROJECT(OpenSceneGraph)
 
 SET(OPENSCENEGRAPH_MAJOR_VERSION 2)
 SET(OPENSCENEGRAPH_MINOR_VERSION 8)
-SET(OPENSCENEGRAPH_PATCH_VERSION 3)
+SET(OPENSCENEGRAPH_PATCH_VERSION 4)
 SET(OPENSCENEGRAPH_SOVERSION 65)
 
 # set to 0 when not a release candidate, non zero means that any generated 
@@ -311,6 +311,9 @@ FIND_PACKAGE(OpenAL)
 FIND_PACKAGE(XUL)
 FIND_PACKAGE(FFmpeg)
 
+# Include macro utilities here
+INCLUDE(OsgMacroUtils)
+
 #use pkg-config to find various modues
 INCLUDE(FindPkgConfig OPTIONAL)
 
@@ -496,8 +499,16 @@ ENDIF(NOT MSVC)
 #
 # On CMake 2.6.x use the newly minted CMAKE_LIBRARY_OUTPUT_DIRECTORY,
 # CMAKE_ARCHIVE_OUTPUT_DIRECTORY & CMAKE_RUNTIME_OUTPUT_DIRECTORY
-
-IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 4)
+#
+# CMake >= 2.8.1 changed the output directory algorithm (See doc).
+# Here we also set per-configuration directories (CMAKE_*_OUTPUT_DIRECTORY_<CONFIG>), or else binaries are generated in /bin/Debug and /bin/Release, etc. with MSVC and Xcode.
+# (Doc reads "multi-configuration generators (VS, Xcode) do NOT append a per-configuration subdirectory to the specified directory").
+# The workaround for 2.6.x (adding "../" as an output prefix for each target) seem to have no effect in >=2.8.1, so there is no need to change this.
+IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 5)
+    # If CMake < 2.6.0
+    SET(EXECUTABLE_OUTPUT_PATH ${OUTPUT_BINDIR})
+    SET(LIBRARY_OUTPUT_PATH    ${OUTPUT_LIBDIR})
+ELSE()
     # If CMake >= 2.6.0
     SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_LIBDIR})
     SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_BINDIR})
@@ -506,10 +517,22 @@ IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 4)
     ELSE(WIN32)
         SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_LIBDIR})
     ENDIF(WIN32)
-ELSE(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 4)
-    SET(EXECUTABLE_OUTPUT_PATH ${OUTPUT_BINDIR})
-    SET(LIBRARY_OUTPUT_PATH ${OUTPUT_LIBDIR})
-ENDIF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 4)
+
+    # Testing CMAKE_VERSION is possible in >= 2.6.4 only
+    BUILDER_VERSION_GREATER(2 8 0)
+    IF(VALID_BUILDER_VERSION)  # If CMake >= 2.8.1
+        FOREACH(CONF ${CMAKE_CONFIGURATION_TYPES})        # For each configuration (Debug, Release, MinSizeRel... and/or anything the user chooses)
+            STRING(TOUPPER "${CONF}" CONF)                # Go uppercase (DEBUG, RELEASE...)
+            SET("CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CONF}" "${OUTPUT_LIBDIR}")
+            SET("CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CONF}" "${OUTPUT_BINDIR}")
+            IF(WIN32)
+                SET("CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CONF}" "${OUTPUT_BINDIR}")
+            ELSE()
+                SET("CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CONF}" "${OUTPUT_LIBDIR}")
+            ENDIF()
+        ENDFOREACH()
+    ENDIF(VALID_BUILDER_VERSION)
+ENDIF()
 
 #SET(INSTALL_BINDIR OpenSceneGraph/bin)
 #SET(INSTALL_INCDIR OpenSceneGraph/include)
@@ -611,7 +634,7 @@ ELSE (DYNAMIC_OPENSCENEGRAPH)
     SET(OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC "STATIC")
 ENDIF(DYNAMIC_OPENSCENEGRAPH)
 
-INCLUDE(OsgMacroUtils)
+
 # OSG Core
 ADD_SUBDIRECTORY(src)
 

CMakeModules/OsgMacroUtils.cmake

@@ -9,6 +9,36 @@
 #  the content of this library for linking when in debugging
 #######################################################################################################
 
+# VALID_BUILDER_VERSION: used for replacing CMAKE_VERSION (available in v2.6.3 RC9) and VERSION_GREATER/VERSION_LESS (available in 2.6.2 RC4).
+# This can be replaced by "IF(${CMAKE_VERSION} VERSION_LESS "x.y.z")" from 2.6.4.
+SET(VALID_BUILDER_VERSION OFF)
+MACRO(BUILDER_VERSION_GREATER MAJOR_VER MINOR_VER PATCH_VER)
+    SET(VALID_BUILDER_VERSION OFF)
+    IF(CMAKE_MAJOR_VERSION GREATER ${MAJOR_VER})
+        SET(VALID_BUILDER_VERSION ON)
+    ELSEIF(CMAKE_MAJOR_VERSION EQUAL ${MAJOR_VER})
+        IF(CMAKE_MINOR_VERSION GREATER ${MINOR_VER})
+            SET(VALID_BUILDER_VERSION ON)
+        ELSEIF(CMAKE_MINOR_VERSION EQUAL ${MINOR_VER})
+            IF(CMAKE_PATCH_VERSION GREATER ${PATCH_VER})
+                SET(VALID_BUILDER_VERSION ON)
+            ENDIF(CMAKE_PATCH_VERSION GREATER ${PATCH_VER})
+        ENDIF()
+    ENDIF()
+ENDMACRO(BUILDER_VERSION_GREATER MAJOR_VER MINOR_VER PATCH_VER)
+
+# CMAKE24: if CMake version is <2.6.0.
+SET(CMAKE24 OFF)
+IF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} LESS 5)
+    SET(CMAKE24 ON)
+ENDIF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} LESS 5)
+
+# CMAKE_VERSION_TEST: Define whether "IF(${CMAKE_VERSION} VERSION_LESS "x.y.z")" can be used or not.
+BUILDER_VERSION_GREATER(2 6 3)
+SET(CMAKE_VERSION_TEST ${VALID_BUILDER_VERSION})        # >= 2.6.4
+
+SET(VALID_BUILDER_VERSION OFF)
+
 
 MACRO(LINK_WITH_VARIABLES TRGTNAME)
     FOREACH(varname ${ARGN})
@@ -21,9 +51,9 @@ MACRO(LINK_WITH_VARIABLES TRGTNAME)
 ENDMACRO(LINK_WITH_VARIABLES TRGTNAME)
 
 MACRO(LINK_INTERNAL TRGTNAME)
-    IF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
+    IF(NOT CMAKE24)
         TARGET_LINK_LIBRARIES(${TRGTNAME} ${ARGN})
-    ELSE(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
+    ELSE(NOT CMAKE24)
         FOREACH(LINKLIB ${ARGN})
             IF(MSVC AND OSG_MSVC_VERSIONED_DLL)
                 #when using versioned names, the .dll name differ from .lib name, there is a problem with that:
@@ -36,7 +66,7 @@ MACRO(LINK_INTERNAL TRGTNAME)
                 TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${LINKLIB}" debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
             ENDIF(MSVC AND OSG_MSVC_VERSIONED_DLL)
         ENDFOREACH(LINKLIB)
-    ENDIF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
+    ENDIF(NOT CMAKE24)
 ENDMACRO(LINK_INTERNAL TRGTNAME)
 
 MACRO(LINK_EXTERNAL TRGTNAME)
@@ -116,6 +146,44 @@ ENDMACRO(SETUP_LINK_LIBRARIES)
 # this is the common set of command for all the plugins
 #
 
+# Sets the output directory property for CMake >= 2.6.0, giving an output path RELATIVE to default one
+MACRO(SET_OUTPUT_DIR_PROPERTY_260 TARGET_TARGETNAME RELATIVE_OUTDIR)
+    BUILDER_VERSION_GREATER(2 8 0)
+    IF(NOT VALID_BUILDER_VERSION)
+        # If CMake <= 2.8.0 (Testing CMAKE_VERSION is possible in >= 2.6.4)
+        IF(MSVC_IDE)
+            # Using the "prefix" hack
+            SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "../${RELATIVE_OUTDIR}/")
+        ELSE(MSVC_IDE)
+            SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "${RELATIVE_OUTDIR}/")
+        ENDIF(MSVC_IDE)
+    ELSE(NOT VALID_BUILDER_VERSION)
+        # Using the output directory properties
+
+        # Global properties (All generators but VS & Xcode)
+        FILE(TO_CMAKE_PATH TMPVAR "CMAKE_ARCHIVE_OUTPUT_DIRECTORY/${RELATIVE_OUTDIR}")
+        SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${TMPVAR}")
+        FILE(TO_CMAKE_PATH TMPVAR "CMAKE_RUNTIME_OUTPUT_DIRECTORY/${RELATIVE_OUTDIR}")
+        SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TMPVAR}")
+        FILE(TO_CMAKE_PATH TMPVAR "CMAKE_LIBRARY_OUTPUT_DIRECTORY/${RELATIVE_OUTDIR}")
+        SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${TMPVAR}")
+
+        # Per-configuration property (VS, Xcode)
+        FOREACH(CONF ${CMAKE_CONFIGURATION_TYPES})        # For each configuration (Debug, Release, MinSizeRel... and/or anything the user chooses)
+            STRING(TOUPPER "${CONF}" CONF)                # Go uppercase (DEBUG, RELEASE...)
+
+            # We use "FILE(TO_CMAKE_PATH", to create nice looking paths
+            FILE(TO_CMAKE_PATH "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CONF}}/${RELATIVE_OUTDIR}" TMPVAR)
+            SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES "ARCHIVE_OUTPUT_DIRECTORY_${CONF}" "${TMPVAR}")
+            FILE(TO_CMAKE_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CONF}}/${RELATIVE_OUTDIR}" TMPVAR)
+            SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES "RUNTIME_OUTPUT_DIRECTORY_${CONF}" "${TMPVAR}")
+            FILE(TO_CMAKE_PATH "${CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CONF}}/${RELATIVE_OUTDIR}" TMPVAR)
+            SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES "LIBRARY_OUTPUT_DIRECTORY_${CONF}" "${TMPVAR}")
+        ENDFOREACH(CONF ${CMAKE_CONFIGURATION_TYPES})
+    ENDIF(NOT VALID_BUILDER_VERSION)
+ENDMACRO(SET_OUTPUT_DIR_PROPERTY_260 TARGET_TARGETNAME RELATIVE_OUTDIR)
+
+
 MACRO(SETUP_PLUGIN PLUGIN_NAME)
 
     SET(TARGET_NAME ${PLUGIN_NAME} )
@@ -152,13 +220,10 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME)
             SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX "")
         ENDIF(NOT UNIX)
     ELSE(NOT MSVC)
-        IF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
-            IF(NOT MSVC_IDE)
-                SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "${OSG_PLUGINS}/")                     
-            ELSE(NOT MSVC_IDE)
-                SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "../${OSG_PLUGINS}/")
-            ENDIF(NOT MSVC_IDE)
-        ELSE(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
+        IF(NOT CMAKE24)
+            SET_OUTPUT_DIR_PROPERTY_260(${TARGET_TARGETNAME} "${OSG_PLUGINS}")        # Sets the ouput to be /osgPlugin-X.X.X ; also ensures the /Debug /Release are removed
+        ELSE(NOT CMAKE24)
+
             IF(OSG_MSVC_VERSIONED_DLL) 
 
                 #this is a hack... the build place is set to lib/<debug or release> by LIBARARY_OUTPUT_PATH equal to OUTPUT_LIBDIR
@@ -181,7 +246,8 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME)
 
                 SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "${OSG_PLUGINS}/")
             ENDIF(OSG_MSVC_VERSIONED_DLL)
-        ENDIF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
+
+        ENDIF(NOT CMAKE24)
     ENDIF(NOT MSVC)
 
     SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}")
@@ -257,7 +323,7 @@ MACRO(SETUP_EXE IS_COMMANDLINE_APP)
     SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES OUTPUT_NAME ${TARGET_NAME})
 
     IF(MSVC_IDE AND OSG_MSVC_VERSIONED_DLL)
-            SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "../")    
+        SET_OUTPUT_DIR_PROPERTY_260(${TARGET_TARGETNAME} "")        # Ensure the /Debug /Release are removed
     ENDIF(MSVC_IDE AND OSG_MSVC_VERSIONED_DLL)
 
     SETUP_LINK_LIBRARIES()    
@@ -341,10 +407,19 @@ MACRO(HANDLE_MSVC_DLL)
         ELSE(${ARGC} GREATER 1)
                 SET(LIB_SOVERSION ${OPENSCENEGRAPH_SOVERSION})
         ENDIF(${ARGC} GREATER 1)
-    
+
+        SET_OUTPUT_DIR_PROPERTY_260(${LIB_NAME} "")        # Ensure the /Debug /Release are removed
         IF(NOT MSVC_IDE) 
-            SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../bin/${LIB_PREFIX}${LIB_SOVERSION}-")
-            IF (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) 
+            IF (NOT CMAKE24)
+                BUILDER_VERSION_GREATER(2 8 0)
+                IF(NOT VALID_BUILDER_VERSION)
+                    # If CMake < 2.8.1
+                    SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../bin/${LIB_PREFIX}${LIB_SOVERSION}-" IMPORT_PREFIX "../")
+                ELSE(NOT VALID_BUILDER_VERSION)
+                    SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "${LIB_PREFIX}${LIB_SOVERSION}-")
+                ENDIF(NOT VALID_BUILDER_VERSION)
+            ELSE (NOT CMAKE24)
+                SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../bin/${LIB_PREFIX}${LIB_SOVERSION}-" IMPORT_PREFIX "../")
                 SET(NEW_LIB_NAME "${OUTPUT_BINDIR}/${LIB_PREFIX}${LIB_SOVERSION}-${LIB_NAME}")
                 ADD_CUSTOM_COMMAND(
                     TARGET ${LIB_NAME}
@@ -354,9 +429,19 @@ MACRO(HANDLE_MSVC_DLL)
                     COMMAND ${CMAKE_COMMAND} -E remove "${NEW_LIB_NAME}.lib"
                     COMMAND ${CMAKE_COMMAND} -E remove "${NEW_LIB_NAME}.exp"
                     )
-            ENDIF (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) 
-        ELSE(NOT MSVC_IDE) 
-            SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../../bin/${LIB_PREFIX}${LIB_SOVERSION}-" IMPORT_PREFIX "../")
+            ENDIF (NOT CMAKE24)
+        ELSE(NOT MSVC_IDE)
+            IF (NOT CMAKE24)
+                BUILDER_VERSION_GREATER(2 8 0)
+                IF(NOT VALID_BUILDER_VERSION)
+                    # If CMake < 2.8.1
+                    SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../../bin/${LIB_PREFIX}${LIB_SOVERSION}-" IMPORT_PREFIX "../")
+                ELSE(NOT VALID_BUILDER_VERSION)
+                    SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "${LIB_PREFIX}${LIB_SOVERSION}-")
+                ENDIF(NOT VALID_BUILDER_VERSION)
+            ELSE (NOT CMAKE24)
+                SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../../bin/${LIB_PREFIX}${LIB_SOVERSION}-" IMPORT_PREFIX "../")
+            ENDIF (NOT CMAKE24)
         ENDIF(NOT MSVC_IDE) 
 
 #     SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../../bin/osg${OPENSCENEGRAPH_SOVERSION}-")

include/osg/NodeTrackerCallback

@@ -18,6 +18,8 @@
 #include <osg/NodeCallback>
 #include <osg/observer_ptr>
 
+#include <iterator>
+
 namespace osg
 {
 

include/osg/Version

@@ -21,7 +21,7 @@ extern "C" {
 
 #define OPENSCENEGRAPH_MAJOR_VERSION    2
 #define OPENSCENEGRAPH_MINOR_VERSION    8
-#define OPENSCENEGRAPH_PATCH_VERSION    3
+#define OPENSCENEGRAPH_PATCH_VERSION    4
 #define OPENSCENEGRAPH_SOVERSION        65
 
 /** convinience macro that can be used to decide whether a feature is present or not i.e.

include/osgGA/NodeTrackerManipulator

@@ -19,6 +19,8 @@
 #include <osg/Quat>
 #include <osg/observer_ptr>
 
+#include <iterator>
+
 namespace osgGA{
 
 class OSGGA_EXPORT NodeTrackerManipulator : public MatrixManipulator

include/osgIntrospection/Value

@@ -224,7 +224,7 @@ namespace osgIntrospection
             // returns the actual pointed type if applicable
             virtual const Type* ptype() const { return 0; }
             // returns whether the data is a null pointer
-            virtual bool nullptr() const = 0;
+            virtual bool isnullptr() const = 0;
 
             Instance_base *inst_;
             Instance_base *_ref_inst;
@@ -237,9 +237,9 @@ namespace osgIntrospection
         {
             Instance_box(): Instance_box_base(), nullptr_(false) {}
 
-            Instance_box(const T &d, bool nullptr = false)
+            Instance_box(const T &d, bool isnullptr = false)
             :    Instance_box_base(),
-                nullptr_(nullptr)
+                nullptr_(isnullptr)
             {
                 Instance<T> *vl = new Instance<T>(d);
                 inst_ = vl;
@@ -267,7 +267,7 @@ namespace osgIntrospection
                 return &typeof(T);
             }
 
-            virtual bool nullptr() const
+            virtual bool isnullptr() const
             {
                 return nullptr_;
             }
@@ -322,7 +322,7 @@ namespace osgIntrospection
                 return &typeofvalue(*static_cast<Instance<T> *>(inst_)->_data);
             }
 
-            virtual bool nullptr() const
+            virtual bool isnullptr() const
             {
                 return static_cast<Instance<T> *>(inst_)->_data == 0;
             }
@@ -428,7 +428,7 @@ namespace osgIntrospection
 
     inline bool Value::isNullPointer() const
     {
-        return _inbox->nullptr();
+        return _inbox->isnullptr();
     }
 
 }

src/osg/GraphicsContext.cpp

@@ -31,6 +31,7 @@
 #include <map>
 #include <sstream>
 #include <algorithm>
+#include <iterator>
 
 using namespace osg;
 

src/osgDB/DatabasePager.cpp

@@ -29,6 +29,7 @@
 #include <algorithm>
 #include <functional>
 #include <set>
+#include <iterator>
 
 #include <stdlib.h>
 #include <string.h>

src/osgPlugins/ffmpeg/FFmpegAudioStream.hpp

@@ -2,9 +2,10 @@
 #ifndef HEADER_GUARD_OSGFFMPEG_FFMPEG_AUDIO_STREAM_H
 #define HEADER_GUARD_OSGFFMPEG_FFMPEG_AUDIO_STREAM_H
 
-#include <osg/AudioStream>
 #include "FFmpegDecoder.hpp"
 
+#include <osg/AudioStream>
+
 namespace osgFFmpeg
 {
 

src/osgPlugins/ffmpeg/FFmpegHeaders.hpp

@@ -6,6 +6,7 @@
 extern "C"
 {
 #define __STDC_CONSTANT_MACROS
+#define FF_API_OLD_SAMPLE_FMT 0
 #include <errno.h>    // for error codes defined in avformat.h
 #include <stdint.h>
 #include <avcodec.h>

src/osgPlugins/ffmpeg/FFmpegImageStream.hpp

@@ -2,13 +2,14 @@
 #ifndef HEADER_GUARD_OSGFFMPEG_FFMPEG_IMAGE_STREAM_H
 #define HEADER_GUARD_OSGFFMPEG_FFMPEG_IMAGE_STREAM_H
 
+#include "FFmpegDecoder.hpp"
+#include "MessageQueue.hpp"
+
 #include <osg/ImageStream>
 
 #include <OpenThreads/Condition>
 #include <OpenThreads/Thread>
 
-#include "FFmpegDecoder.hpp"
-#include "MessageQueue.hpp"
 
 namespace osgFFmpeg
 {

src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp

@@ -11,14 +11,12 @@
  * OpenSceneGraph Public License for more details.
 */
 
+#include "FFmpegImageStream.hpp"
+
 #include <osgDB/Registry>
 #include <osgDB/FileNameUtils>
 #include <osgDB/FileUtils>
 
-#include "FFmpegHeaders.hpp"
-#include "FFmpegImageStream.hpp"
-
-
 
 /** Implementation heavily inspired by http://www.dranger.com/ffmpeg/ */
 

src/osgShadow/ConvexPolyhedron.cpp

@@ -22,6 +22,7 @@
 #include<cassert>
 #include<deque>
 #include<algorithm>
+#include <iterator>
 
 #include <stdio.h>
 #include <string.h>

src/osgText/String.cpp

@@ -3,6 +3,8 @@
 #include <osg/Notify>
 #include <osg/Math>
 
+#include <iterator>
+
 using namespace osgText;
 
 ////////////////////////////////////////////////////////////////////////

src/osgUtil/DelaunayTriangulator.cpp

@@ -23,6 +23,7 @@
 #include <algorithm>
 #include <set>
 #include <map> //GWM July 2005 map is used in constraints.
+#include <iterator>
 #include <osgUtil/Tessellator> // tessellator triangulates the constrained triangles
 
 namespace osgUtil

src/osgUtil/Optimizer.cpp

@@ -43,6 +43,7 @@
 #include <algorithm>
 #include <numeric>
 #include <sstream>
+#include <iterator>
 
 using namespace osgUtil;
 

src/osgUtil/SceneView.cpp

@@ -27,6 +27,8 @@
 
 #include <osg/GLU>
 
+#include <iterator>
+
 using namespace osg;
 using namespace osgUtil;
 

src/osgUtil/Simplifier.cpp

@@ -21,6 +21,7 @@
 #include <set>
 #include <list>
 #include <algorithm>
+#include <iterator>
 
 using namespace osgUtil;
 

src/osgUtil/TriStripVisitor.cpp

@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <algorithm>
 #include <map>
+#include <iterator>
 
 #include "TriStrip_tri_stripper.h"
 

src/osgViewer/View.cpp

@@ -25,6 +25,8 @@
 #include <osgUtil/Optimizer>
 #include <osgUtil/IntersectionVisitor>
 
+#include <iterator>
+
 using namespace osgViewer;
 
 class CollectedCoordinateSystemNodesVisitor : public osg::NodeVisitor