OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +03:00
Code Activity

0024588: Fix some ICC warning fixes

Browse Source 
Some of ICC warning fixes reported in 0024574 are fixed
Remove redundant ifdef
This commit is contained in:
abv
2014-02-06 10:57:56 +04:00
parent 747301b6aa
commit 9a81cca84b
7 changed files with 7 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Draw/Draw_VariableCommands.cxx
View File

@@ -779,10 +779,6 @@ void Draw::Set(const Standard_CString name,
const Handle(Draw_Drawable3D)& D,
const Standard_Boolean displ)
{
Standard_PCharacter pName;
//
pName=(Standard_PCharacter)name;
//
if ((name[0] == '.') && (name[1] == '\0')) {
if (!D.IsNull()) {
dout.RemoveDrawable(D);
@@ -791,19 +787,19 @@ void Draw::Set(const Standard_CString name,
}
else {
Tcl_UnsetVar(theCommands.Interp(),pName,0);
Tcl_UnsetVar(theCommands.Interp(),name,0);
if (!D.IsNull()) {
Standard_Integer ival = theVariables.Extent() + 1;
theVariables.Bind(ival,D);
// MKV 29.03.05
#if ((TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))) && !defined(USE_NON_CONST)
D->Name((const Standard_CString)Tcl_SetVar(theCommands.Interp(),name,name,0));
D->Name(Tcl_SetVar(theCommands.Interp(),name,name,0));
#else
D->Name(Tcl_SetVar(theCommands.Interp(),pName,pName,0));
D->Name(Tcl_SetVar(theCommands.Interp(),(char*)name,(char*)name,0));
#endif
// set the trace function
Tcl_TraceVar(theCommands.Interp(),pName,TCL_TRACE_UNSETS,
Tcl_TraceVar(theCommands.Interp(),name,TCL_TRACE_UNSETS,
tracevar,(ClientData)ival);
if (displ) {

17
src/Draw/Draw_Viewer.cxx
View File

@@ -1053,23 +1053,6 @@ void Draw_Viewer::Repaint3D () const
}
}
//=======================================================================
//function : GetWindow
//purpose :
//=======================================================================
unsigned long Draw_Viewer::GetWindow (const Standard_Integer id) const
{
if (Draw_Batch) return 0;
if (myViews[id]) {
#if defined(_WIN32) || defined(__WIN32__)
return (unsigned long)(myViews[id]->win);
#elif !defined(__APPLE__) || defined(MACOSX_USE_GLX)
return myViews[id]->win;
#endif
}
return 0;
}
//=======================================================================
//function : DeleteView
//purpose :

1
src/Draw/Draw_Viewer.hxx
View File

@@ -130,7 +130,6 @@ class Draw_Viewer {
__Draw_API void RepaintAll () const;
__Draw_API void Repaint2D () const;
__Draw_API void Repaint3D () const;
__Draw_API unsigned long GetWindow (const Standard_Integer id) const;
__Draw_API void DeleteView (const Standard_Integer id);
__Draw_API void Clear ();
__Draw_API void Clear2D ();