OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-09 18:50:54 +03:00
Code Packages Releases 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 committed by apn
parent 124021462e
commit f1a5afa25c
8 changed files with 7 additions and 49 deletions
Show Stats 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 ();

2
src/IntPatch/IntPatch_Point.cxx
View File

@ -162,7 +162,7 @@ void IntPatch_Point::Dump() const {
if(onS2)
printf("*OnS2* par=%15.10f arc2=%10p", (double)prm2, (void*)arcS2.operator->());
if(vtxonS2)
printf(" *Vtx2* vtx2=%10lu", (void*)vS2.operator->());
printf(" *Vtx2* vtx2=%10p", (void*)vS2.operator->());
if(onS2 || vtxonS2)
printf("\n");

9
src/OSD/OSD_signal_WNT.cxx
View File

@ -67,15 +67,6 @@ static BOOL WINAPI _osd_ctrl_break_handler ( DWORD );
static LONG _osd_debug ( void );
MB_DESC fatalErrorDesc[] = {
{ MBT_ICON, ( int )IDI_HAND },
{ MBT_BUTTON, IDYES, TEXT( "Continue" ) },
{ MBT_BUTTON, IDNO, TEXT( "Debugger" ) },
{ MBT_BUTTON, IDCANCEL, TEXT( "Stop" ) }
};
//# define _OSD_FPX ( _EM_INVALID | _EM_DENORMAL | _EM_ZERODIVIDE | _EM_OVERFLOW | _EM_UNDERFLOW )
# define _OSD_FPX ( _EM_INVALID | _EM_DENORMAL | _EM_ZERODIVIDE | _EM_OVERFLOW )

2
src/Units/Units_Token.cxx
View File

@ -390,7 +390,7 @@ void Units_Token::Dump(const Standard_Integer ashift,
TCollection_AsciiString mean = Mean();
for(i=0; i<ashift; i++)cout<<" ";
cout << "Units_Token::Dump of " << hex << (long ) this << dec << endl;
cout << "Units_Token::Dump of " << this << endl;
for(i=0; i<ashift; i++)cout<<" ";
cout<<word.ToCString()<<endl;
for(i=0; i<ashift; i++)cout<<" ";

5
src/V3d/V3d_View.cxx
View File

@ -1600,11 +1600,6 @@ void V3d_View::WindowFit(const Standard_Integer Xmin, const Standard_Integer Ymi
gp_Pnt aPanFrom = myCamera->ConvertProj2View (aScreenCenter);
gp_Vec aPanVec (aPanFrom, aPanTo);
gp_Pnt a1 (aUMin, aVMin, 0.0);
gp_Pnt a2 (aUMax, aVMax, 0.0);
gp_Pnt ap1 = myCamera->ConvertProj2View (a1);
gp_Pnt ap2 = myCamera->ConvertProj2View (a2);
// compute section size
gp_Pnt aFitTopRight (aUMax, aVMax, aDepth);
gp_Pnt aFitBotLeft (aUMin, aVMin, aDepth);

8
src/WNT/WNT_Window.cxx
View File

@ -157,13 +157,7 @@ void WNT_Window :: Destroy ()
//**************************** SetCursor *********************************//
//***//
void WNT_Window :: SetCursor ( const Aspect_Handle aCursor ) const {
#ifndef _WIN64
SetClassLong ( ( HWND )myHWindow, GCL_HCURSOR, ( LONG )aCursor );
#else
SetClassLong ( ( HWND )myHWindow, GCLP_HCURSOR, ( LONG )aCursor );
#endif
SetClassLongPtr ((HWND)myHWindow, GCLP_HCURSOR, (LONG_PTR)aCursor);
} // end WNT_Window :: SetCursor
//***//