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

Fixes to try and keep OSX and Win32 compiling with the new usage of std::max.

Browse Source
This commit is contained in:
Robert Osfield
2003-02-23 15:50:57 +00:00
parent 696c89e2c5
commit 5471ada6da
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osg/ApplicationUsage.cpp
View File

@@ -54,7 +54,7 @@ void ApplicationUsage::write(std::ostream& output, const ApplicationUsage::Usage
citr!=um.end();
++citr)
{
maxNumCharsInOptions = std::max(maxNumCharsInOptions,citr->first.length());
maxNumCharsInOptions = std::max(maxNumCharsInOptions,(unsigned int)citr->first.length());
}
unsigned int fullWidth = widthOfOutput;
@@ -89,7 +89,7 @@ void ApplicationUsage::write(std::ostream& output, const ApplicationUsage::Usage
firstInLine = false;
unsigned int width = std::min(explanation.length()-pos,explanationWidth-offset);
unsigned int width = std::min((unsigned int)explanation.length()-pos,explanationWidth-offset);
unsigned int slashn_pos = explanation.find('\n',pos);
unsigned int extraSkip = 0;
bool concatinated = false;