FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed shadows warnings

Browse Source
This commit is contained in:
Robert Osfield
2016-05-23 20:02:36 +01:00
parent 2056800017
commit c36c0033fd
9 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osgDB/ExternalFileWriter
View File

@@ -63,7 +63,7 @@ namespace osgDB
struct ObjectData
{
ObjectData() : written(false) {}
ObjectData(const std::string & absolutePath, const std::string & relativePath, bool written) : absolutePath(absolutePath), relativePath(relativePath), written(written) {}
ObjectData(const std::string & in_absolutePath, const std::string & in_relativePath, bool in_written) : absolutePath(in_absolutePath), relativePath(in_relativePath), written(in_written) {}
std::string absolutePath;
std::string relativePath;
bool written; ///< Says if write succeeded or not.

2
include/osgDB/XmlParser
View File

@@ -149,7 +149,7 @@ class OSGDB_EXPORT XmlNode : public osg::Referenced
bool writeChildren(const ControlMap& controlMap, std::ostream& fout, const std::string& indent) const;
bool writeProperties(const ControlMap& controlMap, std::ostream& fout) const;
bool readAndReplaceControl(std::string& contents, Input& input);
bool readAndReplaceControl(std::string& in_contents, Input& input) const;
};
}