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

Merge pull request #758 from LaurensVoerman/osgt_indentation

Browse Source 
fix indentation for osgt files for windows dynamic library build.
This commit is contained in:
OpenSceneGraph git repository 2019-06-14 14:32:31 +01:00 committed by GitHub
commit 52edc4af8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/osgDB/StreamOperator
View File

@ -62,8 +62,9 @@ protected:
// Return true if the manipulator is std::endl // Return true if the manipulator is std::endl
bool isEndl( std::ostream& (*fn)(std::ostream&) ) bool isEndl( std::ostream& (*fn)(std::ostream&) )
{ {
#ifdef __sun #if defined (__sun) || (defined _WIN32 && !defined OSG_LIBRARY_STATIC)
// What a mess, but solaris does not like taking the address below // 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; std::stringstream ss;
ss << fn; ss << fn;
std::string s = ss.str(); std::string s = ss.str();