0024588: Fix some ICC warning fixes

Some of ICC warning fixes reported in 0024574 are fixed
Remove redundant ifdef

diff --git a/src/Draw/Draw_VariableCommands.cxx b/src/Draw/Draw_VariableCommands.cxx
index 97da0ed..c55b12f 100644 (file)
--- a/src/Draw/Draw_VariableCommands.cxx
+++ b/src/Draw/Draw_VariableCommands.cxx
@@ -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) {

diff --git a/src/Draw/Draw_Viewer.cxx b/src/Draw/Draw_Viewer.cxx
index cfc6498..4ce87d2 100644 (file)
--- a/src/Draw/Draw_Viewer.cxx
+++ b/src/Draw/Draw_Viewer.cxx
@@ -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  :

diff --git a/src/Draw/Draw_Viewer.hxx b/src/Draw/Draw_Viewer.hxx
index f430ad8..2e90e54 100644 (file)
--- a/src/Draw/Draw_Viewer.hxx
+++ b/src/Draw/Draw_Viewer.hxx
@@ -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     ();

diff --git a/src/IntPatch/IntPatch_Point.cxx b/src/IntPatch/IntPatch_Point.cxx
index 00750ba..e2fc464 100644 (file)
--- a/src/IntPatch/IntPatch_Point.cxx
+++ b/src/IntPatch/IntPatch_Point.cxx
@@ -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");

diff --git a/src/OSD/OSD_signal_WNT.cxx b/src/OSD/OSD_signal_WNT.cxx
index d4fb346..4e1da64 100644 (file)
--- a/src/OSD/OSD_signal_WNT.cxx
+++ b/src/OSD/OSD_signal_WNT.cxx
@@ -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 )
 

diff --git a/src/Units/Units_Token.cxx b/src/Units/Units_Token.cxx
index a71feb1..fb0578a 100644 (file)
--- a/src/Units/Units_Token.cxx
+++ b/src/Units/Units_Token.cxx
@@ -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<<"  ";

diff --git a/src/V3d/V3d_View.cxx b/src/V3d/V3d_View.cxx
index ed22690..a047d2a 100644 (file)
--- a/src/V3d/V3d_View.cxx
+++ b/src/V3d/V3d_View.cxx
@@ -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);

diff --git a/src/WNT/WNT_Window.cxx b/src/WNT/WNT_Window.cxx
index a19120a..e4db1f7 100644 (file)
--- a/src/WNT/WNT_Window.cxx
+++ b/src/WNT/WNT_Window.cxx
@@ -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
 
 //***//