OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0026690: Problem of compilation on imac monoblock

Browse Source
This commit is contained in:
isk 2015-09-15 16:36:50 +03:00 committed by bugmaster
parent 63cf1bb64f
commit a5565a3cb5
4 changed files with 53 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/ViewerTest/ViewerTest.cxx
View File

@ -155,6 +155,30 @@ Standard_Integer ViewerTest::ParseColor (Standard_Integer theArgNb,
return 0; return 0;
} }
//=======================================================================
//function : ParseOnOff
//purpose :
//=======================================================================
Standard_Boolean ViewerTest::ParseOnOff (Standard_CString theArg,
Standard_Boolean& theIsOn)
{
TCollection_AsciiString aFlag(theArg);
aFlag.LowerCase();
if (aFlag == "on"
|| aFlag == "1")
{
theIsOn = Standard_True;
return Standard_True;
}
else if (aFlag == "off"
|| aFlag == "0")
{
theIsOn = Standard_False;
return Standard_True;
}
return Standard_False;
}
//======================================================================= //=======================================================================
//function : GetTypeNames //function : GetTypeNames
//purpose : //purpose :

4
src/ViewerTest/ViewerTest.hxx
View File

@ -187,6 +187,10 @@ public:
TCollection_AsciiString& theName, TCollection_AsciiString& theName,
TCollection_AsciiString& theValue); TCollection_AsciiString& theValue);
//! Parses boolean argument.
//! Handles either flag specified by 0|1 or on|off.
Standard_EXPORT static Standard_Boolean ParseOnOff (Standard_CString theArg,
Standard_Boolean& theIsOn);
private: private:
//! Returns a window class that implements standard behavior of //! Returns a window class that implements standard behavior of

4
src/ViewerTest/ViewerTest_ObjectCommands.cxx
View File

@ -149,8 +149,6 @@ extern Standard_Boolean VDisplayAISObject (const TCollection_AsciiString& theNam
Standard_Boolean theReplaceIfExists = Standard_True); Standard_Boolean theReplaceIfExists = Standard_True);
extern int ViewerMainLoop(Standard_Integer argc, const char** argv); extern int ViewerMainLoop(Standard_Integer argc, const char** argv);
extern Handle(AIS_InteractiveContext)& TheAISContext(); extern Handle(AIS_InteractiveContext)& TheAISContext();
extern Standard_Boolean parseOnOff (Standard_CString theArg,
Standard_Boolean& theIsOn);
//============================================================================== //==============================================================================
@ -5469,7 +5467,7 @@ static int TextToBRep (Draw_Interpretor& /*theDI*/,
return 1; return 1;
} }
parseOnOff (theArgVec[anArgIt], anIsCompositeCurve); ViewerTest::ParseOnOff (theArgVec[anArgIt], anIsCompositeCurve);
} }
else if (aParam == "-plane") else if (aParam == "-plane")
{ {

68
src/ViewerTest/ViewerTest_ViewerCommands.cxx
View File

@ -95,26 +95,6 @@
#include <tk.h> #include <tk.h>
#endif #endif
inline Standard_Boolean parseOnOff (Standard_CString theArg,
Standard_Boolean& theIsOn)
{
TCollection_AsciiString aFlag (theArg);
aFlag.LowerCase();
if (aFlag == "on"
|| aFlag == "1")
{
theIsOn = Standard_True;
return Standard_True;
}
else if (aFlag == "off"
|| aFlag == "0")
{
theIsOn = Standard_False;
return Standard_True;
}
return Standard_False;
}
// Auxiliary definitions // Auxiliary definitions
static const char THE_KEY_DELETE = 127; static const char THE_KEY_DELETE = 127;
@ -5193,7 +5173,7 @@ static int VGlDebug (Draw_Interpretor& theDI,
{ {
Standard_Boolean toShowWarns = Standard_True; Standard_Boolean toShowWarns = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !parseOnOff (theArgVec[anArgIter], toShowWarns)) && !ViewerTest::ParseOnOff (theArgVec[anArgIter], toShowWarns))
{ {
--anArgIter; --anArgIter;
} }
@ -5209,7 +5189,7 @@ static int VGlDebug (Draw_Interpretor& theDI,
{ {
Standard_Boolean toShow = Standard_True; Standard_Boolean toShow = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !parseOnOff (theArgVec[anArgIter], toShow)) && !ViewerTest::ParseOnOff (theArgVec[anArgIter], toShow))
{ {
--anArgIter; --anArgIter;
} }
@ -5225,7 +5205,7 @@ static int VGlDebug (Draw_Interpretor& theDI,
{ {
Standard_Boolean toSuppress = Standard_True; Standard_Boolean toSuppress = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !parseOnOff (theArgVec[anArgIter], toSuppress)) && !ViewerTest::ParseOnOff (theArgVec[anArgIter], toSuppress))
{ {
--anArgIter; --anArgIter;
} }
@ -5239,7 +5219,7 @@ static int VGlDebug (Draw_Interpretor& theDI,
{ {
Standard_Boolean toSync = Standard_True; Standard_Boolean toSync = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !parseOnOff (theArgVec[anArgIter], toSync)) && !ViewerTest::ParseOnOff (theArgVec[anArgIter], toSync))
{ {
--anArgIter; --anArgIter;
} }
@ -5252,13 +5232,13 @@ static int VGlDebug (Draw_Interpretor& theDI,
else if (anArgCase == "-debug") else if (anArgCase == "-debug")
{ {
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !parseOnOff (theArgVec[anArgIter], toEnableDebug)) && !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnableDebug))
{ {
--anArgIter; --anArgIter;
} }
aDefCaps->contextDebug = toEnableDebug; aDefCaps->contextDebug = toEnableDebug;
} }
else if (parseOnOff (anArg, toEnableDebug) else if (ViewerTest::ParseOnOff (anArg, toEnableDebug)
&& (anArgIter + 1 == theArgNb)) && (anArgIter + 1 == theArgNb))
{ {
// simple alias to turn on almost everything // simple alias to turn on almost everything
@ -5363,7 +5343,7 @@ static int VCaps (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !parseOnOff (theArgVec[anArgIter], toEnable)) && !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -5373,7 +5353,7 @@ static int VCaps (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !parseOnOff (theArgVec[anArgIter], toEnable)) && !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -5383,7 +5363,7 @@ static int VCaps (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !parseOnOff (theArgVec[anArgIter], toEnable)) && !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -5394,7 +5374,7 @@ static int VCaps (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !parseOnOff (theArgVec[anArgIter], toEnable)) && !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -5404,7 +5384,7 @@ static int VCaps (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !parseOnOff (theArgVec[anArgIter], toEnable)) && !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -5415,7 +5395,7 @@ static int VCaps (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !parseOnOff (theArgVec[anArgIter], toEnable)) && !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -5428,7 +5408,7 @@ static int VCaps (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !parseOnOff (theArgVec[anArgIter], toEnable)) && !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -5443,7 +5423,7 @@ static int VCaps (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !parseOnOff (theArgVec[anArgIter], toEnable)) && !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -5458,7 +5438,7 @@ static int VCaps (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !parseOnOff (theArgVec[anArgIter], toEnable)) && !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -7418,7 +7398,7 @@ static int VStereo (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !parseOnOff (theArgVec[anArgIter], toEnable)) && !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -7429,7 +7409,7 @@ static int VStereo (Draw_Interpretor& theDI,
{ {
Standard_Boolean toDisable = Standard_True; Standard_Boolean toDisable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !parseOnOff (theArgVec[anArgIter], toDisable)) && !ViewerTest::ParseOnOff (theArgVec[anArgIter], toDisable))
{ {
--anArgIter; --anArgIter;
} }
@ -8305,7 +8285,7 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !parseOnOff (theArgVec[anArgIter], toEnable)) && !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -8322,7 +8302,7 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !parseOnOff (theArgVec[anArgIter], toEnable)) && !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -8338,7 +8318,7 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !parseOnOff (theArgVec[anArgIter], toEnable)) && !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -8354,7 +8334,7 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !parseOnOff (theArgVec[anArgIter], toEnable)) && !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -8370,7 +8350,7 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !parseOnOff (theArgVec[anArgIter], toEnable)) && !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -8391,7 +8371,7 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !parseOnOff (theArgVec[anArgIter], toEnable)) && !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -8407,7 +8387,7 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !parseOnOff (theArgVec[anArgIter], toEnable)) && !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }