Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph

include/osgDB/fstream

@@ -31,27 +31,27 @@ namespace osgDB
 
 void OSGDB_EXPORT open(std::fstream& fs, const char* filename,std::ios_base::openmode mode);
 
-class OSGDB_EXPORT ifstream : public std::ifstream
+class ifstream : public std::ifstream
 {
 public:
-    ifstream();
-    explicit ifstream(const char* filename,
+    OSGDB_EXPORT ifstream();
+    OSGDB_EXPORT explicit ifstream(const char* filename,
         std::ios_base::openmode mode = std::ios_base::in);
-    ~ifstream();
+    OSGDB_EXPORT ~ifstream();
 
-    void open(const char* filename,
+    void OSGDB_EXPORT open(const char* filename,
         std::ios_base::openmode mode = std::ios_base::in);
 };
 
-class OSGDB_EXPORT ofstream : public std::ofstream
+class ofstream : public std::ofstream
 {
 public:
-    ofstream();
-    explicit ofstream(const char* filename,
+    OSGDB_EXPORT ofstream();
+    OSGDB_EXPORT explicit ofstream(const char* filename,
         std::ios_base::openmode mode = std::ios_base::out);
-    ~ofstream();
+    OSGDB_EXPORT ~ofstream();
 
-    void open(const char* filename,
+    void OSGDB_EXPORT open(const char* filename,
         std::ios_base::openmode mode = std::ios_base::out);
 };
 

include/osgUtil/IncrementalCompileOperation

@@ -266,6 +266,8 @@ class OSGUTIL_EXPORT IncrementalCompileOperation : public osg::GraphicsOperation
             typedef std::map<osg::GraphicsContext*, CompileList >  CompileMap;
             CompileMap                              _compileMap;
 
+            osg::ref_ptr<osg::Object>               _markerObject;
+
         protected:
 
             virtual ~CompileSet() {}