0023072: Eliminate compiler warnings (level 3) on Windows / MSVC++

diff --git a/src/AIS/AIS_InteractiveContext.cdl b/src/AIS/AIS_InteractiveContext.cdl
index bab1ae87b5b2c48a6a0c671dacf0a0d7431d7238..5dbf80b696eaae39fd373ad98648e595c6eb24e3 100755 (executable)
--- a/src/AIS/AIS_InteractiveContext.cdl
+++ b/src/AIS/AIS_InteractiveContext.cdl
@@ -761,8 +761,8 @@ is
     SetPolygonOffsets ( me : mutable;
                anObj        : InteractiveObject from AIS;
                aMode        : Integer from Standard;
-               aFactor      : Real from Standard = 1.0;
-               aUnits       : Real from Standard = 0.0;
+               aFactor      : ShortReal from Standard = 1.0;
+               aUnits       : ShortReal from Standard = 0.0;
        updateviewer : Boolean from Standard = Standard_True ) is static;
     ---Purpose: Sets up polygon offsets for the given AIS_InteractiveObject.
     --          It simply calls anObj->SetPolygonOffsets() 
@@ -779,8 +779,8 @@ is
     PolygonOffsets ( me;
                anObj   : InteractiveObject from AIS;
                aMode   : out Integer from Standard;
-               aFactor : out Real from Standard;
-               aUnits  : out Real from Standard ) is static;
+               aFactor : out ShortReal from Standard;
+               aUnits  : out ShortReal from Standard ) is static;
     ---Level: Public
     ---Purpose: Retrieves current polygon offsets settings for <anObj>.
     ---Category: Inquire methods

diff --git a/src/AIS/AIS_InteractiveContext_3.cxx b/src/AIS/AIS_InteractiveContext_3.cxx
index 1d89688f3287b9d5fcf6a3aad20814bc2537e2f4..ec3ff60320fe70c8ed74fc6d1bad620039636824 100755 (executable)
--- a/src/AIS/AIS_InteractiveContext_3.cxx
+++ b/src/AIS/AIS_InteractiveContext_3.cxx
@@ -56,8 +56,8 @@ void AIS_InteractiveContext::DisplayFromCollector(const Handle(AIS_InteractiveOb
 void AIS_InteractiveContext::SetPolygonOffsets(
                              const Handle(AIS_InteractiveObject)& anObj,
                              const Standard_Integer               aMode,
-                             const Standard_Real                  aFactor,
-                             const Standard_Real                  aUnits,
+                             const Standard_ShortReal             aFactor,
+                             const Standard_ShortReal             aUnits,
                              const Standard_Boolean               updateviewer) 
 {
   if ( anObj.IsNull() )
@@ -94,8 +94,8 @@ Standard_Boolean AIS_InteractiveContext::HasPolygonOffsets(const Handle(AIS_Inte
 void AIS_InteractiveContext::PolygonOffsets(
                              const Handle(AIS_InteractiveObject)& anObj,
                              Standard_Integer&                    aMode,
-                             Standard_Real&                       aFactor,
-                             Standard_Real&                       aUnits) const 
+                             Standard_ShortReal&                  aFactor,
+                             Standard_ShortReal&                  aUnits) const 
 {
   if ( HasPolygonOffsets( anObj ) )
     anObj->PolygonOffsets( aMode, aFactor, aUnits );

diff --git a/src/AIS/AIS_InteractiveObject.cdl b/src/AIS/AIS_InteractiveObject.cdl
index 18a4573e02413e301b417753546052019bafffc3..e1b98ad179685d085397f960452a577e8dd2e0f5 100755 (executable)
--- a/src/AIS/AIS_InteractiveObject.cdl
+++ b/src/AIS/AIS_InteractiveObject.cdl
@@ -616,8 +616,8 @@ is
     -- 22-03-04 OCC4895 SAN High-level interface for controlling polygon offsets
     SetPolygonOffsets ( me : mutable;
                 aMode   : Integer from Standard;
-                aFactor : Real from Standard = 1.0;
-                aUnits  : Real from Standard = 0.0 ) is virtual;
+                aFactor : ShortReal from Standard = 1.0;
+                aUnits  : ShortReal from Standard = 0.0 ) is virtual;
        ---Level: Public
        ---Purpose: Sets up polygon offsets for this object.
        --          It modifies all existing presentations of <anObj> (if any),
@@ -655,8 +655,8 @@ is
 
     PolygonOffsets ( me;
                 aMode   : out Integer from Standard;
-                aFactor : out Real from Standard;
-                aUnits  : out Real from Standard ) is virtual;
+                aFactor : out ShortReal from Standard;
+                aUnits  : out ShortReal from Standard ) is virtual;
        ---Level: Public
        ---Purpose: Retrieves current polygon offsets settings from <myDrawer>.
        ---Category: Inquire methods

diff --git a/src/AIS/AIS_InteractiveObject.cxx b/src/AIS/AIS_InteractiveObject.cxx
index f86fc46435137339053805fba7bd1bbafc77ad3e..80438e05672e458e8fa6dde5f502d9dff5dcd451 100755 (executable)
--- a/src/AIS/AIS_InteractiveObject.cxx
+++ b/src/AIS/AIS_InteractiveObject.cxx
@@ -749,9 +749,9 @@ void AIS_InteractiveObject::SetAspect(const Handle(Prs3d_BasicAspect)& anAspect,
 //function : SetPolygonOffsets 
 //purpose  : 
 //======================================================================= 
-void AIS_InteractiveObject::SetPolygonOffsets(const Standard_Integer aMode,
-                                              const Standard_Real    aFactor,
-                                              const Standard_Real    aUnits) 
+void AIS_InteractiveObject::SetPolygonOffsets(const Standard_Integer    aMode,
+                                              const Standard_ShortReal  aFactor,
+                                              const Standard_ShortReal  aUnits) 
 {
   if ( !HasPolygonOffsets() )
     myDrawer->SetShadingAspect(new Prs3d_ShadingAspect());
@@ -806,9 +806,9 @@ Standard_Boolean AIS_InteractiveObject::HasPolygonOffsets() const
 //function : PolygonOffsets 
 //purpose  : 
 //=======================================================================
-void AIS_InteractiveObject::PolygonOffsets(Standard_Integer& aMode,
-                                           Standard_Real&    aFactor,
-                                           Standard_Real&    aUnits) const 
+void AIS_InteractiveObject::PolygonOffsets(Standard_Integer&    aMode,
+                                           Standard_ShortReal&  aFactor,
+                                           Standard_ShortReal&  aUnits) const 
 {
   if( HasPolygonOffsets() )
     myDrawer->ShadingAspect()->Aspect()->PolygonOffsets( aMode, aFactor, aUnits );

diff --git a/src/AIS/AIS_TexturedShape.cxx b/src/AIS/AIS_TexturedShape.cxx
index d1d4e2ff010e3c1aac28a28a7c107d65c159096f..86c96c958f977ccd9c4bcd1a2215330a2f1d4965 100755 (executable)
--- a/src/AIS/AIS_TexturedShape.cxx
+++ b/src/AIS/AIS_TexturedShape.cxx
@@ -333,7 +333,7 @@ void AIS_TexturedShape::Compute (const Handle(PrsMgr_PresentationManager3d)& /*t
         if (HasPolygonOffsets())
         {
           Standard_Integer aMode;
-          Standard_Real aFactor, aUnits;
+          Standard_ShortReal aFactor, aUnits;
           PolygonOffsets(aMode, aFactor, aUnits);
           myAspect->SetPolygonOffsets(aMode, aFactor, aUnits);
         }

diff --git a/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx b/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx
index 31db642cd69a4c547e6dbdb0b8c0bda66fa07ea8..b3c02d8279c4d4aa33c3de6b09a08109d05f1bf7 100755 (executable)
--- a/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx
+++ b/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx
@@ -210,7 +210,7 @@ void BinLDrivers_DocumentRetrievalDriver::Read
   mySections.Clear();
   myPAtt.Init();
   Handle(TDF_Data) aData = new TDF_Data();
-  Standard_Integer aDocumentPos = -1;
+  streampos aDocumentPos = -1;
 
   // 2b. Read the TOC of Sections
   if (aFileVer >= 3) {
@@ -274,7 +274,7 @@ void BinLDrivers_DocumentRetrievalDriver::Read
   } // end of reading Sections or shape section
 
   // Return to read of the Document structure
-  anIS.seekg((streampos) aDocumentPos);
+  anIS.seekg(aDocumentPos);
 
   // read the header (tag) of the root label
   Standard_Integer aTag;

diff --git a/src/BinTools/BinTools_ShapeSet.cxx b/src/BinTools/BinTools_ShapeSet.cxx
index ef57d98a25330f97f9298ec95b0a12591c80f44e..95f25509e2c5af4aa6b7aed83a2282b37cc90b1b 100755 (executable)
--- a/src/BinTools/BinTools_ShapeSet.cxx
+++ b/src/BinTools/BinTools_ShapeSet.cxx
@@ -386,7 +386,7 @@ void  BinTools_ShapeSet::Read(Standard_IStream& IS)
     IS.getline(vers,100,'\n');
     // BUC60769 PTV 18.10.2000: remove possible '\r' at the end of the line
     
-    for (Standard_Integer lv = (strlen(vers)- 1); lv > 1 && (vers[lv] == '\r' || vers[lv] == '\n') ;lv--) 
+    for (Standard_Size lv = (strlen(vers)- 1); lv > 1 && (vers[lv] == '\r' || vers[lv] == '\n') ;lv--) 
       vers[lv] = '\0';
     
   } while ( ! IS.fail() && strcmp(vers,Version_1) && strcmp(vers,Version_2) &&
@@ -805,7 +805,7 @@ void  BinTools_ShapeSet::ReadGeometry(const TopAbs_ShapeEnum T,
            if (val > 0 && val <= 3) 
              BinTools::GetReal(IS, p1); 
          } else {
-           Standard_Integer aPos = IS.tellg();
+        streampos aPos = IS.tellg();
            BinTools::GetReal(IS, p1);      
            val = (Standard_Integer)IS.get();//case {0|1|2|3}
 #ifdef MDTV_DEB

diff --git a/src/CGM/cgmobin.c b/src/CGM/cgmobin.c
index 7079667abbcb53b7c6d835a2fda4cd4ddf491f8e..d651ac3a9c226a4d7fd54ae308a5227ec2f77986 100755 (executable)
--- a/src/CGM/cgmobin.c
+++ b/src/CGM/cgmobin.c
@@ -196,7 +196,7 @@ CGMObin(FILE *stream, Code c, Long *pi, Float *pr, char *str)
             {
                register Long *pt = pi, i, k;
                Long red, green, blue, nc, ncol;
-               unsigned short run, packed;
+               Long run, packed;
                Long last, lastred, lastgreen, lastblue;
                static Long nx, ny;
                static Prec lprec;

diff --git a/src/DDF/DDF_IOStream.cxx b/src/DDF/DDF_IOStream.cxx
index 3ba8b6afe174fd2fdb7363d124e38dd98b2250e4..cf491a2d04e0c5b85ea0f543f8d2d5e0b1430b12 100755 (executable)
--- a/src/DDF/DDF_IOStream.cxx
+++ b/src/DDF/DDF_IOStream.cxx
@@ -635,7 +635,7 @@ Storage_Error DDF_IOStream::BeginReadInfoSection()
 {
   Storage_Error s;
   TCollection_AsciiString l;
-  Standard_Integer        len = strlen(DDF_IOStream::MagicNumber());
+  Standard_Integer        len = (Standard_Integer) strlen(DDF_IOStream::MagicNumber());
 
   // Added because of Draw:
   // It don't go to next line after reading its own header line information!
@@ -1336,7 +1336,7 @@ Storage_Error DDF_IOStream::IsGoodFileType(istream* anIStream)
 
   if (s == Storage_VSOk) {
     TCollection_AsciiString l;
-    Standard_Integer        len = strlen(DDF_IOStream::MagicNumber());
+    Standard_Integer        len = (Standard_Integer) strlen(DDF_IOStream::MagicNumber());
 
     f.ReadChar(l,len);
 

diff --git a/src/Draw/Draw_Interpretor.cxx b/src/Draw/Draw_Interpretor.cxx
index e26e4052be0ed4b983e32f7cfdc2de77acc96bbd..56f475bb1d488932eff75a56071e0915d348db5b 100755 (executable)
--- a/src/Draw/Draw_Interpretor.cxx
+++ b/src/Draw/Draw_Interpretor.cxx
@@ -375,7 +375,7 @@ void Draw_Interpretor::Add(const Standard_CString n,
   if (myInterp==NULL) Init();
 
   CData* C = new CData(f,this);
-  Standard_Integer length, num_slashes,  ii,  jj,  kk;
+  Standard_Size length, num_slashes,  ii,  jj,  kk;
   Tcl_CreateCommand(myInterp,pN,CommandCmd, (ClientData) C, CommandDelete);
 
   // add the help
@@ -691,4 +691,4 @@ Standard_Boolean Draw_Interpretor::GetDoEcho () const
 Standard_SStream& Draw_Interpretor::Log ()
 {
   return myLog;
-}
\ No newline at end of file
+}

diff --git a/src/DrawTrSurf/DrawTrSurf.cxx b/src/DrawTrSurf/DrawTrSurf.cxx
index 732d428d3fff95d07346585ee88700ecce875878..47d68789b9bb302f61c0dbeb4b4401d8e0904e6b 100755 (executable)
--- a/src/DrawTrSurf/DrawTrSurf.cxx
+++ b/src/DrawTrSurf/DrawTrSurf.cxx
@@ -1769,7 +1769,7 @@ static void pntsave(const Handle(Draw_Drawable3D)&d, ostream& OS)
   OS.precision(15);
 #else
   long form = OS.setf(ios::scientific);
-  int  prec = OS.precision(15);
+  std::streamsize prec = OS.precision(15);
 #endif
   gp_Pnt P = N->Point();
   if (N->Is3D()) {
@@ -1831,7 +1831,7 @@ static void triasave(const Handle(Draw_Drawable3D)&d, ostream& OS)
   OS.precision(15);
 #else
   long form = OS.setf(ios::scientific);
-  int  prec = OS.precision(15);
+  std::streamsize prec = OS.precision(15);
 #endif
   Poly::Write(T->Triangulation(),OS);
 #if defined(HAVE_IOS) && !defined(__sgi) && !defined(IRIX)
@@ -1872,7 +1872,7 @@ static void poly3dsave(const Handle(Draw_Drawable3D)&d, ostream& OS)
   OS.precision(15);
 #else
   long form = OS.setf(ios::scientific);
-  int  prec = OS.precision(15);
+  std::streamsize prec = OS.precision(15);
 #endif
   Poly::Write(T->Polygon3D(),OS);
 #if defined(HAVE_IOS) && !defined(__sgi) && !defined(IRIX)
@@ -1912,7 +1912,7 @@ static void poly2dsave(const Handle(Draw_Drawable3D)&d, ostream& OS)
   OS.precision(15);
 #else
   long form = OS.setf(ios::scientific);
-  int  prec = OS.precision(15);
+  std::streamsize prec = OS.precision(15);
 #endif
   Poly::Write(T->Polygon2D(),OS);
 #if defined(HAVE_IOS) && !defined(__sgi) && !defined(IRIX)

diff --git a/src/DrawTrSurf/DrawTrSurf_Point.cxx b/src/DrawTrSurf/DrawTrSurf_Point.cxx
index 2e3d244cf9db3b9cb4d1554f9393855e7718790f..08f9324ab0b79ae84188b5d50776c855c2b4f822 100755 (executable)
--- a/src/DrawTrSurf/DrawTrSurf_Point.cxx
+++ b/src/DrawTrSurf/DrawTrSurf_Point.cxx
@@ -197,7 +197,7 @@ void DrawTrSurf_Point::Dump(Standard_OStream& S) const
   S.precision(15);
 #else
   long form = S.setf(ios::scientific);
-  int  prec = S.precision(15);
+  std::streamsize prec = S.precision(15);
 #endif
   if (is3D)
     S << "Point : " << myPoint.X() << ", " << myPoint.Y() << ", " << myPoint.Z() <<endl;

diff --git a/src/GeomTools/GeomTools_Curve2dSet.cxx b/src/GeomTools/GeomTools_Curve2dSet.cxx
index cef92183a14c594a360199d4cec1c700a543139b..5737f1fc29ccd3f432c2504763716c011bc1d04c 100755 (executable)
--- a/src/GeomTools/GeomTools_Curve2dSet.cxx
+++ b/src/GeomTools/GeomTools_Curve2dSet.cxx
@@ -502,7 +502,7 @@ void  GeomTools_Curve2dSet::Dump(Standard_OStream& OS)const
 
 void  GeomTools_Curve2dSet::Write(Standard_OStream& OS)const 
 {
-  int  prec = OS.precision(17);
+  std::streamsize prec = OS.precision(17);
 
   Standard_Integer i, nbsurf = myMap.Extent();
   OS << "Curve2ds "<< nbsurf << "\n";

diff --git a/src/GeomTools/GeomTools_CurveSet.cxx b/src/GeomTools/GeomTools_CurveSet.cxx
index d9027ec171a430d110e3f372f60be15ef54ae0c7..ffebaf43cefce1f15897df877874f33b3d92efe8 100755 (executable)
--- a/src/GeomTools/GeomTools_CurveSet.cxx
+++ b/src/GeomTools/GeomTools_CurveSet.cxx
@@ -519,7 +519,7 @@ void  GeomTools_CurveSet::Dump(Standard_OStream& OS)const
 
 void  GeomTools_CurveSet::Write(Standard_OStream& OS)const 
 {
-  int  prec = OS.precision(17);
+  std::streamsize  prec = OS.precision(17);
 
   Standard_Integer i, nbcurve = myMap.Extent();
   OS << "Curves "<< nbcurve << "\n";

diff --git a/src/GeomTools/GeomTools_SurfaceSet.cxx b/src/GeomTools/GeomTools_SurfaceSet.cxx
index fa3701d831c40ba3f66c62603acbb99566b5cf2d..ec321c2213391200690f3b017a8d263ffd03d6d6 100755 (executable)
--- a/src/GeomTools/GeomTools_SurfaceSet.cxx
+++ b/src/GeomTools/GeomTools_SurfaceSet.cxx
@@ -639,7 +639,7 @@ void  GeomTools_SurfaceSet::Dump(Standard_OStream& OS)const
 
 void  GeomTools_SurfaceSet::Write(Standard_OStream& OS)const 
 {
-  int  prec = OS.precision(17);
+  std::streamsize  prec = OS.precision(17);
 
   Standard_Integer i, nbsurf = myMap.Extent();
   OS << "Surfaces "<< nbsurf << "\n";

diff --git a/src/Graphic3d/Graphic3d_AspectFillArea3d.cdl b/src/Graphic3d/Graphic3d_AspectFillArea3d.cdl
index a9bdfc1589f5acad165de96ad275dd911e4eea7c..040aba5cbc216c020dedd5221c42c596a9bab1a3 100755 (executable)
--- a/src/Graphic3d/Graphic3d_AspectFillArea3d.cdl
+++ b/src/Graphic3d/Graphic3d_AspectFillArea3d.cdl
@@ -203,8 +203,8 @@ is
         -- 22-03-04 OCC4895 SAN High-level interface for controlling polygon offsets
         SetPolygonOffsets ( me : mutable;
                             aMode   : Integer from Standard;
-                            aFactor : Real from Standard = 1.0;
-                            aUnits  : Real from Standard = 0.0 );
+                            aFactor : ShortReal from Standard = 1.0;
+                            aUnits  : ShortReal from Standard = 0.0 );
         ---Level: Public
         ---Purpose: Sets up OpenGL polygon offsets mechanism.
         --          <aMode> parameter can contain various combinations of 
@@ -291,8 +291,8 @@ is
         -- 22-03-04 OCC4895 SAN High-level interface for controlling polygon offsets
         PolygonOffsets ( me;
                          aMode   : out Integer from Standard;
-                         aFactor : out Real from Standard;
-                         aUnits  : out Real from Standard );
+                         aFactor : out ShortReal from Standard;
+                         aUnits  : out ShortReal from Standard );
         ---Level: Public
         ---Purpose: Returns current polygon offsets settings.
         ---Category: Inquire methods    
@@ -342,7 +342,7 @@ fields
         -- 22-03-04 OCC4895 SAN High-level interface for controlling polygon offsets
         -- polygon offsets
         MyPolygonOffsetMode     :       Integer from Standard;
-        MyPolygonOffsetFactor   :       Real from Standard;
-        MyPolygonOffsetUnits    :       Real from Standard;
+        MyPolygonOffsetFactor   :       ShortReal from Standard;
+        MyPolygonOffsetUnits    :       ShortReal from Standard;
 
 end AspectFillArea3d;

diff --git a/src/Graphic3d/Graphic3d_AspectFillArea3d.cxx b/src/Graphic3d/Graphic3d_AspectFillArea3d.cxx
index c4877bc89a8722d6c78dabe5449f4d9d5052328a..2e959c3280a2640064f57a14aee71dcf557e1199 100755 (executable)
--- a/src/Graphic3d/Graphic3d_AspectFillArea3d.cxx
+++ b/src/Graphic3d/Graphic3d_AspectFillArea3d.cxx
@@ -247,17 +247,17 @@ Aspect_TypeOfDegenerateModel Graphic3d_AspectFillArea3d::DegenerateModel(
 }
 
 // OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets 
-void Graphic3d_AspectFillArea3d::SetPolygonOffsets(const Standard_Integer aMode,
-                                                   const Standard_Real    aFactor,
-                                                   const Standard_Real    aUnits) {
+void Graphic3d_AspectFillArea3d::SetPolygonOffsets(const Standard_Integer    aMode,
+                                                   const Standard_ShortReal  aFactor,
+                                                   const Standard_ShortReal  aUnits) {
   MyPolygonOffsetMode   = ( aMode & Aspect_POM_Mask );
   MyPolygonOffsetFactor = aFactor;
   MyPolygonOffsetUnits  = aUnits;
 }
 
-void Graphic3d_AspectFillArea3d::PolygonOffsets(Standard_Integer& aMode,
-                                                Standard_Real&    aFactor,
-                                                Standard_Real&    aUnits) const {
+void Graphic3d_AspectFillArea3d::PolygonOffsets(Standard_Integer&    aMode,
+                                                Standard_ShortReal&  aFactor,
+                                                Standard_ShortReal&  aUnits) const {
   aMode   = MyPolygonOffsetMode;
   aFactor = MyPolygonOffsetFactor;
   aUnits  = MyPolygonOffsetUnits;

diff --git a/src/Graphic3d/Graphic3d_Group_8.cxx b/src/Graphic3d/Graphic3d_Group_8.cxx
index 3dc269c032b6218df5f0d9c98ba1472250c36433..423e5c3b75bc167edd3ebd007b1f8133dbe550b8 100755 (executable)
--- a/src/Graphic3d/Graphic3d_Group_8.cxx
+++ b/src/Graphic3d/Graphic3d_Group_8.cxx
@@ -278,7 +278,7 @@ void Graphic3d_Group::SetGroupPrimitivesAspect (const Handle(Graphic3d_AspectFil
 
   // OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets 
   Standard_Integer aPolyMode;
-  Standard_Real    aPolyFactor, aPolyUnits;
+  Standard_ShortReal    aPolyFactor, aPolyUnits;
   CTX->PolygonOffsets(aPolyMode, aPolyFactor, aPolyUnits);
   MyCGroup.ContextFillArea.PolygonOffsetMode   = aPolyMode;
   MyCGroup.ContextFillArea.PolygonOffsetFactor = aPolyFactor;
@@ -362,7 +362,7 @@ void Graphic3d_Group::SetGroupPrimitivesAspect (const Handle(Graphic3d_AspectTex
   MyCGroup.ContextText.ColorSubTitle.g    = float (Gs);
   MyCGroup.ContextText.ColorSubTitle.b    = float (Bs);
   MyCGroup.ContextText.TextZoomable   = ATextZoomable;   
-  MyCGroup.ContextText.TextAngle    = ATextAngle;   
+  MyCGroup.ContextText.TextAngle    = float (ATextAngle);   
   MyCGroup.ContextText.TextFontAspect   = (int)ATextFontAspect;
 
   MyCGroup.ContextText.IsDef      = 1;
@@ -598,7 +598,7 @@ void Graphic3d_Group::SetPrimitivesAspect (const Handle(Graphic3d_AspectFillArea
 
   // OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets 
   Standard_Integer aPolyMode;
-  Standard_Real    aPolyFactor, aPolyUnits;
+  Standard_ShortReal    aPolyFactor, aPolyUnits;
   CTX->PolygonOffsets(aPolyMode, aPolyFactor, aPolyUnits);
   MyCGroup.ContextFillArea.PolygonOffsetMode   = aPolyMode;
   MyCGroup.ContextFillArea.PolygonOffsetFactor = aPolyFactor;
@@ -682,7 +682,7 @@ void Graphic3d_Group::SetPrimitivesAspect (const Handle(Graphic3d_AspectText3d)&
   MyCGroup.ContextText.ColorSubTitle.g    = float (Gs);
   MyCGroup.ContextText.ColorSubTitle.b    = float (Bs);
   MyCGroup.ContextText.TextZoomable   = ATextZoomable;  
-  MyCGroup.ContextText.TextAngle    = ATextAngle;   
+  MyCGroup.ContextText.TextAngle    = float (ATextAngle);   
   MyCGroup.ContextText.TextFontAspect   = (int)ATextFontAspect;   
   MyCGroup.ContextText.IsDef              = 1;
 

diff --git a/src/Graphic3d/Graphic3d_Structure.cxx b/src/Graphic3d/Graphic3d_Structure.cxx
index f3e3f8e68e61b4f9aed72563dd1dd172ae3292aa..615e1f180013cfc4decfe460aa659eee7b142084 100755 (executable)
--- a/src/Graphic3d/Graphic3d_Structure.cxx
+++ b/src/Graphic3d/Graphic3d_Structure.cxx
@@ -1262,7 +1262,7 @@ void Graphic3d_Structure::SetPrimitivesAspect (const Handle(Graphic3d_AspectFill
 
   // OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets
   Standard_Integer aPolyMode;
-  Standard_Real    aPolyFactor, aPolyUnits;
+  Standard_ShortReal    aPolyFactor, aPolyUnits;
   CTX->PolygonOffsets(aPolyMode, aPolyFactor, aPolyUnits);
   MyCStructure.ContextFillArea.PolygonOffsetMode   = aPolyMode;
   MyCStructure.ContextFillArea.PolygonOffsetFactor = aPolyFactor;
@@ -1319,7 +1319,7 @@ void Graphic3d_Structure::SetPrimitivesAspect (const Handle(Graphic3d_AspectText
   MyCStructure.ContextText.ColorSubTitle.g  = float (Gs);
   MyCStructure.ContextText.ColorSubTitle.b  = float (Bs);
   MyCStructure.ContextText.TextZoomable     = ATextZoomable;
-  MyCStructure.ContextText.TextAngle        = ATextAngle;
+  MyCStructure.ContextText.TextAngle        = float (ATextAngle);
   MyCStructure.ContextText.TextFontAspect   = (int)ATextFontAspect;
 
   MyCStructure.ContextText.IsDef          = 1;
@@ -1783,9 +1783,9 @@ void Graphic3d_Structure::SetTransformPersistence( const Graphic3d_TransModeFlag
   if (IsDeleted ()) return;
 
   MyCStructure.TransformPersistence.Flag = AFlag;
-  MyCStructure.TransformPersistence.Point.x = APoint.X();
-  MyCStructure.TransformPersistence.Point.y = APoint.Y();
-  MyCStructure.TransformPersistence.Point.z = APoint.Z();
+  MyCStructure.TransformPersistence.Point.x = float (APoint.X());
+  MyCStructure.TransformPersistence.Point.y = float (APoint.Y());
+  MyCStructure.TransformPersistence.Point.z = float (APoint.Z());
   //MyStructureManager->Update ();
   //Update();
   MyGraphicDriver->ContextStructure( MyCStructure );
@@ -2157,7 +2157,7 @@ void Graphic3d_Structure::UpdateStructure (const Handle(Graphic3d_AspectLine3d)&
   MyCStructure.ContextText.ColorSubTitle.g  = float (Gs);
   MyCStructure.ContextText.ColorSubTitle.b  = float (Bs);
   MyCStructure.ContextText.TextZoomable     = ATextZoomable;
-  MyCStructure.ContextText.TextAngle        = ATextAngle;
+  MyCStructure.ContextText.TextAngle        = float (ATextAngle);
   MyCStructure.ContextText.TextFontAspect   = (int)ATextFontAspect;
 
 
@@ -2339,7 +2339,7 @@ void Graphic3d_Structure::UpdateStructure (const Handle(Graphic3d_AspectLine3d)&
 
   // OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets
   Standard_Integer aPolyMode;
-  Standard_Real    aPolyFactor, aPolyUnits;
+  Standard_ShortReal    aPolyFactor, aPolyUnits;
   CTXF->PolygonOffsets(aPolyMode, aPolyFactor, aPolyUnits);
   MyCStructure.ContextFillArea.PolygonOffsetMode   = aPolyMode;
   MyCStructure.ContextFillArea.PolygonOffsetFactor = aPolyFactor;

diff --git a/src/IFSelect/IFSelect_Editor.cxx b/src/IFSelect/IFSelect_Editor.cxx
index 435666fccbd07b9691f0b7c3e32fe315de87d0fe..f389a3d2e2dc4ba552af0909b596b5e70008a99a 100755 (executable)
--- a/src/IFSelect/IFSelect_Editor.cxx
+++ b/src/IFSelect/IFSelect_Editor.cxx
@@ -41,9 +41,9 @@ IFSelect_Editor::IFSelect_Editor (const Standard_Integer nbval)
   Standard_Integer lng = shn.Length();
   if (lng > 0) thenames->SetItem (shortname,num);
   if (lng > themaxsh) themaxsh = lng;
-  lng = strlen (typval->Name());
+  lng = (Standard_Integer) strlen (typval->Name());
   if (lng > themaxco) themaxco = lng;
-  lng = strlen (typval->Label());
+  lng = (Standard_Integer) strlen (typval->Label());
   if (lng > themaxla) themaxla = lng;
 
   thenames->SetItem (typval->Name(),num);

diff --git a/src/Interface/Interface_MSG.cxx b/src/Interface/Interface_MSG.cxx
index 6f643c7c811399ff732ebf53f0c18eaf93ba5f9c..1dc99bd020f8185b97b0edbe91e980088040bdae 100755 (executable)
--- a/src/Interface/Interface_MSG.cxx
+++ b/src/Interface/Interface_MSG.cxx
@@ -43,7 +43,7 @@ static Standard_Boolean theraise  = Standard_False;
 
 static char blank[] =
 "                                                                            ";
-static Standard_Integer maxblank = strlen(blank);
+static Standard_Integer maxblank = (Standard_Integer) strlen(blank);
 
 
 Interface_MSG::Interface_MSG (const Standard_CString key)
@@ -59,7 +59,7 @@ Interface_MSG::Interface_MSG
 {
   char mess[300];
   sprintf (mess, Interface_MSG::Translated(thekey), i1);
-  theval = new char (strlen (mess)+1 );
+  theval = new char[strlen (mess) + 1];
   strcpy (theval,mess);
 }
 
@@ -70,7 +70,7 @@ Interface_MSG::Interface_MSG
 {
   char mess[300];
   sprintf (mess, Interface_MSG::Translated(thekey), i1,i2);
-  theval = new char (strlen (mess)+1 );
+  theval = new char[strlen (mess) + 1];
   strcpy (theval,mess);
 }
 
@@ -82,7 +82,7 @@ Interface_MSG::Interface_MSG
   char mess[300];
   sprintf (mess, Interface_MSG::Translated(thekey),
           (intervals < 0 ? r1 : Interface_MSG::Intervalled(r1,intervals)) );
-  theval = new char (strlen (mess)+1 );
+  theval = new char[strlen (mess) + 1];
   strcpy (theval,mess);
 }
 
@@ -93,7 +93,7 @@ Interface_MSG::Interface_MSG
 {
   char mess[300];
   sprintf (mess, Interface_MSG::Translated(thekey), str);
-  theval = new char (strlen (mess)+1 );
+  theval = new char[strlen (mess) + 1];
   strcpy (theval,mess);
 }
 
@@ -105,7 +105,7 @@ Interface_MSG::Interface_MSG
 {
   char mess[300];
   sprintf (mess, Interface_MSG::Translated(thekey), val, str);
-  theval = new char (strlen (mess)+1 );
+  theval = new char[strlen (mess) + 1];
   strcpy (theval,mess);
 }
 
@@ -444,7 +444,7 @@ Standard_CString  Interface_MSG::Blanks (const Standard_Integer val,
 Standard_CString  Interface_MSG::Blanks (const Standard_CString val,
                                          const Standard_Integer max)
 {
-  Standard_Integer lng = strlen(val);
+  Standard_Integer lng = (Standard_Integer) strlen(val);
   if (lng > maxblank || lng > max) return "";
   return &blank [maxblank - max + lng];
 }
@@ -464,7 +464,7 @@ void  Interface_MSG::Print (Standard_OStream& S, const Standard_CString val,
                             const Standard_Integer just)
 {
   if (max > maxblank)  {  Print(S,val,maxblank,just);  return;  }
-  Standard_Integer lng = strlen (val);
+  Standard_Integer lng = (Standard_Integer) strlen (val);
   if (lng > max)  {  S << val;  return;  }
   Standard_Integer m1 = (max-lng) /2;
   Standard_Integer m2 = max-lng - m1;

diff --git a/src/LDOM/LDOMBasicString.cxx b/src/LDOM/LDOMBasicString.cxx
index f423b698c7963142de34d3ce4baa4ee2d4d2f56d..8991092fb29b6496c3b3d7431f05535baef5144e 100755 (executable)
--- a/src/LDOM/LDOMBasicString.cxx
+++ b/src/LDOM/LDOMBasicString.cxx
@@ -37,7 +37,7 @@ LDOMBasicString::LDOMBasicString (const char * aValue)
     myVal.ptr = NULL;
   } else {
     myType = LDOM_AsciiFree;
-    Standard_Integer aLen = strlen (aValue) + 1;
+    Standard_Size aLen = strlen (aValue) + 1;
     myVal.ptr = new char [aLen];
     memcpy (myVal.ptr, aValue, aLen);
   }
@@ -56,7 +56,7 @@ LDOMBasicString::LDOMBasicString (const char                     * aValue,
     myVal.ptr = NULL;
   } else {
     myType = LDOM_AsciiDoc;
-    Standard_Integer aLen = strlen (aValue) + 1;
+    Standard_Integer aLen = (Standard_Integer) strlen (aValue) + 1;
     myVal.ptr = aDoc -> Allocate (aLen);
     memcpy (myVal.ptr, aValue, aLen);
   }
@@ -93,7 +93,7 @@ LDOMBasicString::LDOMBasicString (const LDOMBasicString& anOther)
   switch (myType) {
   case LDOM_AsciiFree:
     if (anOther.myVal.ptr) {
-      Standard_Integer aLen = strlen ((const char *)anOther.myVal.ptr) + 1;
+      Standard_Size aLen = strlen ((const char *)anOther.myVal.ptr) + 1;
       myVal.ptr = new char [aLen];
       memcpy (myVal.ptr, anOther.myVal.ptr, aLen);
       break;
@@ -149,7 +149,7 @@ LDOMBasicString& LDOMBasicString::operator = (const LDOMBasicString& anOther)
   switch (myType) {
   case LDOM_AsciiFree:
     if (anOther.myVal.ptr) {
-      Standard_Integer aLen = strlen ((const char *)anOther.myVal.ptr) + 1;
+      Standard_Size aLen = strlen ((const char *)anOther.myVal.ptr) + 1;
       myVal.ptr = new char [aLen];
       memcpy (myVal.ptr, anOther.myVal.ptr, aLen);
       break;
@@ -269,7 +269,7 @@ LDOMBasicString::operator TCollection_ExtendedString () const
 
     // convert Unicode to Extended String
     ptr += 2;
-    Standard_Integer aLength = (strlen(ptr) / 4), j = 0;
+    Standard_Size aLength = (strlen(ptr) / 4), j = 0;
     Standard_ExtCharacter * aResult = new Standard_ExtCharacter[aLength--];
     while (aLength--) {
       ptr += 4;

diff --git a/src/LDOM/LDOM_XmlReader.cxx b/src/LDOM/LDOM_XmlReader.cxx
index 87986fd6aca96d45f4aa04be4f3fc295bfbab1af..b009073f1e47a5024d36c5c39acca62f5601be54 100755 (executable)
--- a/src/LDOM/LDOM_XmlReader.cxx
+++ b/src/LDOM/LDOM_XmlReader.cxx
@@ -138,7 +138,7 @@ LDOM_XmlReader::RecordType LDOM_XmlReader::ReadRecord
 
       // Read the full buffer and reset start and end buffer pointers
         myPtr    = &myBuffer[0];
-        Standard_Integer aNBytes;
+        Standard_Size aNBytes;
         if (myFileDes != FILE_NONVALUE)
           aNBytes = read (myFileDes, &myBuffer[aBytesRest],
                           XML_BUFFER_SIZE - aBytesRest);

diff --git a/src/LDOM/LDOM_XmlWriter.cxx b/src/LDOM/LDOM_XmlWriter.cxx
index 847098428c647bfc3bd26e9af5886f7158c7e0a0..9d6e854b25e38ac5e0506e8c8243031278a06742 100755 (executable)
--- a/src/LDOM/LDOM_XmlWriter.cxx
+++ b/src/LDOM/LDOM_XmlWriter.cxx
@@ -232,7 +232,7 @@ inline LDOM_XmlWriter& LDOM_XmlWriter::operator <<
     {
       const char * str = aString.GetString();
       if (str) {
-        const Standard_Integer aLen = strlen (str);
+        const Standard_Size aLen = strlen (str);
         if (aLen > 0) fwrite (str, aLen, 1, myFile);
       }
     }
@@ -259,7 +259,7 @@ inline LDOM_XmlWriter& LDOM_XmlWriter::operator <<
 //=======================================================================
 inline LDOM_XmlWriter& LDOM_XmlWriter::operator << (const LXMLCh * aString)
 {
-  unsigned int aLength = strlen (aString);
+  Standard_Size aLength = strlen (aString);
   if (aLength > 0) fwrite ((void *) aString, aLength, 1, myFile);
   return * this;
 }
@@ -288,7 +288,7 @@ void LDOM_XmlWriter::WriteAttribute (const LDOM_Node& theAtt)
   if (aValueStr.Type() == LDOMBasicString::LDOM_Integer) {
     Standard_Integer anIntValue;
     aValueStr.GetInteger (anIntValue);
-    aLength = 20 + strlen (aName);
+    aLength = (Standard_Integer) (20 + strlen (aName));
     if (aLength > myABufferLen) {
       if (myABuffer != NULL) delete [] myABuffer;
       myABuffer    = new char [aLength+1];
@@ -296,7 +296,7 @@ void LDOM_XmlWriter::WriteAttribute (const LDOM_Node& theAtt)
     }
     sprintf (myABuffer, "%c%s%c%c%d%c", chSpace, aName,
              chEqual, chDoubleQuote, anIntValue, chDoubleQuote);
-    aLength = strlen (myABuffer);
+    aLength = (Standard_Integer) strlen (myABuffer);
 
   //    String attribute value
   } else {
@@ -304,10 +304,10 @@ void LDOM_XmlWriter::WriteAttribute (const LDOM_Node& theAtt)
     char        * encStr;
     if (aValueStr.Type() == LDOMBasicString::LDOM_AsciiDocClear) {
       encStr  = (char *) aValue;
-      aLength = 4 + strlen (aValue) + strlen (aName);
+      aLength = (Standard_Integer) (4 + strlen (aValue) + strlen (aName));
     } else {
       encStr = LDOM_CharReference::Encode (aValue, aLength, Standard_True);
-      aLength += 4 + strlen (aName);
+      aLength += (Standard_Integer) (4 + strlen (aName));
     }
     if (aLength > myABufferLen) {
       if (myABuffer != NULL) delete [] myABuffer;

diff --git a/src/Message/Message_Msg.cxx b/src/Message/Message_Msg.cxx
index 5241398682f267c226d22a71ac55d716c6673c1a..363f80b4c37c354340d51728f679f642a1e7c36a 100755 (executable)
--- a/src/Message/Message_Msg.cxx
+++ b/src/Message/Message_Msg.cxx
@@ -169,7 +169,7 @@ Message_Msg& Message_Msg::Arg (const Standard_CString theString)
     return *this;
 
   // print string according to format
-  char * sStringBuffer = new char [Max (strlen(theString)+1, 1024)];
+  char * sStringBuffer = new char [Max ((Standard_Integer)strlen(theString)+1, 1024)];
   sprintf (sStringBuffer, aFormat.ToCString(), theString);
   TCollection_ExtendedString aStr ( sStringBuffer );
   delete [] sStringBuffer;

diff --git a/src/NCollection/NCollection_BaseVector.cxx b/src/NCollection/NCollection_BaseVector.cxx
index 5deeb2a615793fe8d8f24e677963b2b66a6c6c65..783e86eb510ca8a672239a11a601fbeb96754b8f 100755 (executable)
--- a/src/NCollection/NCollection_BaseVector.cxx
+++ b/src/NCollection/NCollection_BaseVector.cxx
@@ -34,7 +34,7 @@ Standard_Integer NCollection_BaseVector::MemBlock::GetIndexV
                    (void * theItem, const size_t theItemSize) const
 {
   const ptrdiff_t anOffset = (char *) theItem - (char *) myData;
-  const Standard_Integer anIndex = anOffset / theItemSize;
+  const Standard_Integer anIndex = (Standard_Integer) (anOffset / theItemSize);
 #ifdef DEB
   if (anOffset < 0 || anOffset != Standard_Integer (anIndex * theItemSize)
       || anIndex > Standard_Integer (myLength))

diff --git a/src/NIS/NIS_InteractiveObject.hxx b/src/NIS/NIS_InteractiveObject.hxx
index 176c7e878e9ae614183a8499bc71ed45102bd1cb..edbf14773ecf43ad0ea510f53d0b87ce0818d1b9 100755 (executable)
--- a/src/NIS/NIS_InteractiveObject.hxx
+++ b/src/NIS/NIS_InteractiveObject.hxx
@@ -388,7 +388,7 @@ class NIS_InteractiveObject : public Standard_Transient
   // ---------- PRIVATE FIELDS ----------
 
   Handle_NIS_Drawer             myDrawer;
-  Standard_Size                 myID;
+  Standard_Integer              myID;
   NIS_Drawer::DrawType          myDrawType      : 3;
   NIS_Drawer::DrawType          myBaseType      : 3;
   Standard_Boolean              myIsHidden      : 1;

diff --git a/src/OSD/OSD_Host.cxx b/src/OSD/OSD_Host.cxx
index d3d41824a99e41703e5016376cefd9c810c714ac..e9d8e122188da4c248fece1ae65dce6217a54e8e 100755 (executable)
--- a/src/OSD/OSD_Host.cxx
+++ b/src/OSD/OSD_Host.cxx
@@ -277,7 +277,7 @@ OSD_Host :: OSD_Host () {
 
   if (  !Failed ()  ) {
   
-   memSize = ms.dwAvailPageFile;
+    memSize = (Standard_Integer) ms.dwAvailPageFile;
 
    if (   WSAStartup (  MAKEWORD( 1, 1 ), &wd  )   ) {
    

diff --git a/src/OSD/OSD_SystemFont.cxx b/src/OSD/OSD_SystemFont.cxx
index 791e368d5f1a4ea64f77bef5e7c6a9c4d585c807..5accc0c143b76044473f5fc05b1a08d87fb95839 100755 (executable)
--- a/src/OSD/OSD_SystemFont.cxx
+++ b/src/OSD/OSD_SystemFont.cxx
@@ -71,7 +71,7 @@ MyFontAspect(OSD_FA_Undefined)
       MyFaceSize = -1;
     else
       //TODO catch exeption
-      MyFaceSize =  str.Token( "-", 7 ).RealValue();
+      MyFaceSize =  str.Token( "-", 7 ).IntegerValue();
 
     //detect aspect
     if ( str.Token("-", 3).IsEqual( "bold" ) )

diff --git a/src/OpenGl/OpenGl_Display_1.cxx b/src/OpenGl/OpenGl_Display_1.cxx
index 52e2bee420853f98f8de429ba79e6ad84f7d3c47..e81239642d514107bdd9c990b04a69ca4aa21ab9 100644 (file)
--- a/src/OpenGl/OpenGl_Display_1.cxx
+++ b/src/OpenGl/OpenGl_Display_1.cxx
@@ -259,7 +259,7 @@ class MultilineTextRenderer
       myNewStr        (0),
       myStrPtr        (&theStr[0])
   {
-    const Standard_Integer  aStrLen       = wcslen(theStr); // Length of the original string
+    const Standard_Integer  aStrLen       = (Standard_Integer) wcslen(theStr); // Length of the original string
     Standard_Integer        aNextCRChar   = 0;  // Character after '\r' (Carriage Return)        '\x00\x0D'
     Standard_Integer        aHTNum        = 0;  // Number of       '\t' (Horizontal Tabulation)  '\x00\x09'
     Standard_Integer        aDumpNum      = 0;  // Number of '\a', '\b', '\v' and '\f'

diff --git a/src/PCollection/PCollection_HAsciiString.cxx b/src/PCollection/PCollection_HAsciiString.cxx
index 77f1a125760bd4da8e53b20c58f6d1df1fe2d7e3..f2fc6fdf1f991bf8c8f98deb3c64844de554f588 100755 (executable)
--- a/src/PCollection/PCollection_HAsciiString.cxx
+++ b/src/PCollection/PCollection_HAsciiString.cxx
@@ -69,7 +69,7 @@ static int realstr(Standard_Real V, Standard_CString F)
 // Create : from a CString
 //-----------------------------------------------------------------------
 PCollection_HAsciiString::PCollection_HAsciiString(const Standard_CString S)
-                                               : Data(strlen(S))
+                                               : Data((Standard_Integer) strlen(S))
 {
    for( Standard_Integer i = 0 ; i < Data.Length() ; i++) 
                             Data.SetValue(i, S[i]) ;

diff --git a/src/PCollection/PCollection_HExtendedString.cxx b/src/PCollection/PCollection_HExtendedString.cxx
index ee6c038a18d77ce2dfaf32bbcdbef4c76f27d1fc..fc8e125d7fe6141a771a6d5b7bb077b58e1f1cec 100755 (executable)
--- a/src/PCollection/PCollection_HExtendedString.cxx
+++ b/src/PCollection/PCollection_HExtendedString.cxx
@@ -72,7 +72,7 @@ PCollection_HExtendedString::PCollection_HExtendedString
 // Create : from a CString
 //-----------------------------------------------------------------------
 PCollection_HExtendedString::PCollection_HExtendedString(const Standard_CString S)
-                                               : Data(strlen(S))
+                                               : Data((Standard_Integer) strlen(S))
 {
    for( Standard_Integer i = 0 ; i < Data.Length() ; i++)  {
          Standard_ExtCharacter val = ToExtCharacter(S[i]);

diff --git a/src/Prs2d/Prs2d_Diameter.cxx b/src/Prs2d/Prs2d_Diameter.cxx
index b7b9f706119fb9942f701d9bd8cf90186ca2666a..174988149de21d314efe20c2fef0475f12894402 100755 (executable)
--- a/src/Prs2d/Prs2d_Diameter.cxx
+++ b/src/Prs2d/Prs2d_Diameter.cxx
@@ -96,9 +96,9 @@ Prs2d_Diameter::Prs2d_Diameter( const Handle(Graphic2d_GraphicObject)& aGO,
    myAppX2 = Standard_ShortReal(X1);
    myAppY2 = Standard_ShortReal(Y1);
    if (myX1>=myX2) 
-     myAppX2=myAppX2+(theDist+theRad)/APPENDIXLEN;
+     myAppX2=Standard_ShortReal( myAppX2+(theDist+theRad)/APPENDIXLEN );
    else 
-     myAppX2=myAppX2-(theDist+theRad)/APPENDIXLEN;
+     myAppX2=Standard_ShortReal( myAppX2-(theDist+theRad)/APPENDIXLEN );
    
    if ( myAppX2 < myMinX ) myMinX = myAppX2;
    if ( myAppY2 < myMinY ) myMinY = myAppY2;

diff --git a/src/StepData/StepData_StepDumper.cxx b/src/StepData/StepData_StepDumper.cxx
index 777d413ce51fc4c2fdf738f5135a3bb8e2bb5893..af8b393536eb116d1949efff3cc97df5cc1a295d 100755 (executable)
--- a/src/StepData/StepData_StepDumper.cxx
+++ b/src/StepData/StepData_StepDumper.cxx
@@ -159,7 +159,7 @@ Standard_Boolean  StepData_StepDumper::Dump
       for (i = 1; i <= nb; i ++)  {
        if (ids.Value(i) <= 0 || ids.Value(i) == i) continue;
        sprintf (unid,"%d:#%d",i,ids.Value(i));
-       nbc = strlen (unid);  nbr = ((80-nbc) %4) +2;
+       nbc = (Standard_Integer) strlen (unid);  nbr = ((80-nbc) %4) +2;
        nbl +=  nbc;
        if (nbl+nbr0 > 79) { nbl  = nbc;  S<<endl; }
        else               { nbl += nbr0; for (; nbr0 > 0; nbr0 --) S << " "; }

diff --git a/src/StepData/StepData_StepWriter.cxx b/src/StepData/StepData_StepWriter.cxx
index 97bc0568e6244055d1e8c51e6ce9f7656b6e54e4..05450c37c1b58d14c897fa5179ce96085da653d7 100755 (executable)
--- a/src/StepData/StepData_StepWriter.cxx
+++ b/src/StepData/StepData_StepWriter.cxx
@@ -510,7 +510,7 @@ void StepData_StepWriter::SendComment(const Handle(TCollection_HAsciiString)& te
 void StepData_StepWriter::SendComment (const Standard_CString text)
 {
   if (!thecomm) Interface_InterfaceMismatch::Raise("StepWriter : Comment");
-  AddString(text,strlen(text));
+  AddString(text,(Standard_Integer) strlen(text));
 }
 
 
@@ -725,7 +725,7 @@ void StepData_StepWriter::OpenSub ()
 void StepData_StepWriter::OpenTypedSub (const Standard_CString subtype)
 {
   AddParam();
-  if (subtype[0] != '\0') AddString (subtype,strlen(subtype));
+  if (subtype[0] != '\0') AddString (subtype,(Standard_Integer) strlen(subtype));
   AddString(textlist);
   thefirst = Standard_True;
   thelevel ++;
@@ -767,7 +767,7 @@ void StepData_StepWriter::Send (const Standard_Integer val)
   char lval[12];
   AddParam();
   sprintf(lval,"%d",val);
-  AddString(lval,strlen(lval));
+  AddString(lval,(Standard_Integer) strlen(lval));
 }
 
 
@@ -926,7 +926,7 @@ void StepData_StepWriter::Send (const Handle(Standard_Transient)& val)
     if (thelabmode < 2 || idnum == idtrue) sprintf(lident,"#%d",idnum);
     else sprintf(lident,"%d:#%d",idnum,idtrue);
     AddParam();
-    AddString(lident,strlen(lident));
+    AddString(lident,(Standard_Integer) strlen(lident));
   }
 }
 
@@ -979,7 +979,7 @@ void StepData_StepWriter::SendString (const TCollection_AsciiString& val)
 void StepData_StepWriter::SendString (const Standard_CString val)
 {
   AddParam();
-  AddString(val,strlen(val));
+  AddString(val,(Standard_Integer) strlen(val));
 }
 
 //  SendEnum : attention, on envoie un intitule d'Enum ... donc entre .  .

diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_Dumper.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_Dumper.cxx
index e67fef6b808fed9643a33f7fc51ce02e4daef19f..af0afce40479872fc98312ba223f40880faad30d 100755 (executable)
--- a/src/TopOpeBRepDS/TopOpeBRepDS_Dumper.cxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_Dumper.cxx
@@ -208,7 +208,8 @@ Standard_OStream& TopOpeBRepDS_Dumper::Print(const Handle(Geom_BSplineCurve)&
   if (periodic) OS<<"periodic, ";
   OS<<"degree "<<degree<<", "<<nbpoles<<" poles, "<<nbknots<<" knots"<<endl;
   
-  for (i = 1,OS<<"poles : ",l = strlen("poles : ") + 1,n = nbpoles; 
+  //l = strlen("poles : ") + 1
+  for (i = 1,OS<<"poles : ",l = 9,n = nbpoles; 
        i<=n; 
        i++) {
     if (!compact)      { if (i == 1) lb = 0; else lb = l; }
@@ -228,7 +229,8 @@ Standard_OStream& TopOpeBRepDS_Dumper::Print(const Handle(Geom_BSplineCurve)&
     OS<<endl;
   }
   
-  for (i = 1,OS<<"knots : ",l = strlen("knots : ") + 1,n = nbknots;
+  //l = strlen("knots : ") + 1
+  for (i = 1,OS<<"knots : ",l = 9,n = nbknots;
        i<=n;
        i++) {
     if (!compact)      { if (i == 1) lb = 0; else lb = l; }
@@ -281,7 +283,8 @@ Standard_OStream& TopOpeBRepDS_Dumper::Print(const Handle(Geom2d_BSplineCurve)&
   if (periodic) OS<<"periodic, ";
   OS<<"degree "<<degree<<", "<<nbpoles<<" poles, "<<nbknots<<" knots"<<endl;
   
-  for (i = 1,OS<<"poles : ",l = strlen("poles : ") + 1,n = nbpoles; 
+  //l = strlen("poles : ") + 1
+  for (i = 1,OS<<"poles : ",l = 9,n = nbpoles; 
        i<=n; 
        i++) {
     if (!compact)      { if (i == 1) lb = 0; else lb = l; }
@@ -301,7 +304,8 @@ Standard_OStream& TopOpeBRepDS_Dumper::Print(const Handle(Geom2d_BSplineCurve)&
     OS<<endl;
   }
   
-  for (i = 1,OS<<"knots : ",l = strlen("knots : ") + 1,n = nbknots; 
+  //l = strlen("knots : ") + 1
+  for (i = 1,OS<<"knots : ",l = 9,n = nbknots; 
        i<=n; 
        i++) {
     if (!compact)      { if (i == 1) lb = 0; else lb = l; }

diff --git a/src/TopTools/TopTools_LocationSet.cxx b/src/TopTools/TopTools_LocationSet.cxx
index b300cf07898d83bb161793f79d3d2c926dcb50c9..1ba6752d3e60a83efb41671981efb8826d195c3b 100755 (executable)
--- a/src/TopTools/TopTools_LocationSet.cxx
+++ b/src/TopTools/TopTools_LocationSet.cxx
@@ -178,7 +178,7 @@ void  TopTools_LocationSet::Dump(Standard_OStream& OS) const
 void  TopTools_LocationSet::Write(Standard_OStream& OS) const 
 {
   
-  int  prec = OS.precision(15);
+  std::streamsize prec = OS.precision(15);
 
   Standard_Integer i, nbLoc = myMap.Extent();
   OS << "Locations " << nbLoc << "\n";

diff --git a/src/TopTools/TopTools_ShapeSet.cxx b/src/TopTools/TopTools_ShapeSet.cxx
index eb18be0fc3dcbf65bdd867f043979ce02b2c0a14..ce66b94709f82af38243a9fefbcbead99afbb84a 100755 (executable)
--- a/src/TopTools/TopTools_ShapeSet.cxx
+++ b/src/TopTools/TopTools_ShapeSet.cxx
@@ -458,7 +458,7 @@ void  TopTools_ShapeSet::Write(Standard_OStream& OS)
   // on positionne LC_NUMERIC a "C" (point decimal)
   setlocale(LC_NUMERIC, "C") ;
 
-  int  prec = OS.precision(15);
+  std::streamsize prec = OS.precision(15);
 
   // write the copyright
   if (myFormatNb == 2)
@@ -642,7 +642,7 @@ void  TopTools_ShapeSet::Read(Standard_IStream& IS)
     //if(pm = strchr(vers,'\r'))
     //  *pm ='\0';
     
-    for (Standard_Integer lv = (strlen(vers)- 1); lv > 1 && (vers[lv] == '\r' || vers[lv] == '\n') ;lv--) 
+    for (Standard_Size lv = (strlen(vers)- 1); lv > 1 && (vers[lv] == '\r' || vers[lv] == '\n') ;lv--) 
       vers[lv] = '\0';
     
   } while ( ! IS.fail() && strcmp(vers,Version) && strcmp(vers,Version2) );

diff --git a/src/Units/Units_Lexicon.cxx b/src/Units/Units_Lexicon.cxx
index fa7d6b016c39592434936434e590b38917a3a990..8ec33ad1d9f2c1945f8e478503762ae09d44e41a 100755 (executable)
--- a/src/Units/Units_Lexicon.cxx
+++ b/src/Units/Units_Lexicon.cxx
@@ -59,7 +59,8 @@ void Units_Lexicon::Creates(const Standard_CString afilename)
   char *Oper = oper ;
   char *Coeff = coeff ;
 #endif
-  Standard_Integer fr,i;
+  Standard_Integer fr;
+  Standard_Size i;
   Standard_Real value;
   Handle(Units_Token) token;
   struct stat buf;
@@ -85,7 +86,7 @@ void Units_Lexicon::Creates(const Standard_CString afilename)
   //for(i=0; i<=255; i++)line[i]=0;
 
   while(file.getline(line,255)) {
-    int len = strlen( line ) ;
+    Standard_Size len = strlen( line ) ;
     if(len == 1) continue; //skl - ???
     for ( i = 0 ; i < 30 ; i++ ) {
       if ( i < len )

diff --git a/src/Units/Units_Sentence.cxx b/src/Units/Units_Sentence.cxx
index 0ff48a9df2f167e1b64a955dcee530cbae5ac822..432d789acd80699d0075ae18a32d58e5b01e2408 100755 (executable)
--- a/src/Units/Units_Sentence.cxx
+++ b/src/Units/Units_Sentence.cxx
@@ -31,8 +31,8 @@ static Handle(Units_Token) CreateTokenForNumber(const Standard_CString str)
 {
   TCollection_AsciiString tstr = str[0];
   Standard_Boolean IsPoint = Standard_False;
-  Standard_Integer len = strlen(str);
-  for(Standard_Integer in=1; in < len; in++) {
+  Standard_Size len = strlen(str);
+  for(Standard_Size in=1; in < len; in++) {
     if( str[in]=='0' || str[in]=='1' || str[in]=='2' || str[in]=='3' || 
         str[in]=='4' || str[in]=='5' || str[in]=='6' || str[in]=='7' || 
         str[in]=='8' || str[in]=='9' ) {

diff --git a/src/Units/Units_UnitsDictionary.cxx b/src/Units/Units_UnitsDictionary.cxx
index 03f884fa9164c1e9f53f0ead83ba2e4eb990ab03..1dc82bbc85bd2241153a4d215edf93c5dbb72985 100755 (executable)
--- a/src/Units/Units_UnitsDictionary.cxx
+++ b/src/Units/Units_UnitsDictionary.cxx
@@ -146,7 +146,7 @@ void Units_UnitsDictionary::Creates(const Standard_CString afilename)
     file.getline(line,255);
     if (!file)
       break;
-    fr = strlen(line);
+    fr = (Standard_Integer) strlen(line);
     if(fr <= 1)
       continue;
     //if( !file || line[0] == '.') { //skl
@@ -192,7 +192,7 @@ void Units_UnitsDictionary::Creates(const Standard_CString afilename)
       //if(!file) break; //skl
       file.getline(line,255);
       file.getline(line,255);
-      fr = strlen(line);
+      fr = (Standard_Integer) strlen(line);
          
 #if 0 // skl for OCC13438
       //for(i=0; i<80; i++)name[i] = 0;
@@ -277,7 +277,7 @@ void Units_UnitsDictionary::Creates(const Standard_CString afilename)
            << "Convert" << Convert << endl 
            << "Unit2" << Unit2 << endl ;
 #else
-      int len = strlen( line ) ;
+      Standard_Integer len = (Standard_Integer) strlen( line ) ;
       for ( i=0 ; i<51 ; i++ ) {
         if ( i<len )
           fr = sscanf(&line[i],"%c",&unite[i]);
@@ -342,7 +342,7 @@ void Units_UnitsDictionary::Creates(const Standard_CString afilename)
          
       if(convert[0] == '[') {
         coeff = 1.;
-        i = strlen(convert);
+        i = (Standard_Integer) strlen(convert);
         convert[i-1] = 0;
         ismove = Standard_True;
         charnumber = 1;
@@ -371,7 +371,7 @@ void Units_UnitsDictionary::Creates(const Standard_CString afilename)
       }
          
       if(convert[charnumber] == '(') {
-        i = strlen(convert);
+        i = (Standard_Integer) strlen(convert);
         convert[i-1] = 0;
         Units_MathSentence mathsentence(&convert[charnumber+1]);
         if(ismove)

diff --git a/src/ViewerTest/ViewerTest_ObjectCommands.cxx b/src/ViewerTest/ViewerTest_ObjectCommands.cxx
index f496abcea3745442d9d37350a568b0b297fa3119..34d5cee96369e62cde9ffac896d855eccedc7575 100755 (executable)
--- a/src/ViewerTest/ViewerTest_ObjectCommands.cxx
+++ b/src/ViewerTest/ViewerTest_ObjectCommands.cxx
@@ -4260,12 +4260,12 @@ static Standard_Integer VPolygonOffset(Draw_Interpretor& di,
   }
 
   Standard_Integer aMode;
-  Standard_Real    aFactor, aUnits;
+  Standard_ShortReal    aFactor, aUnits;
   if (argc == 5)
   {
     aMode   = atoi(argv[2]);
-    aFactor = atof(argv[3]);
-    aUnits  = atof(argv[4]);
+    aFactor = (Standard_ShortReal) atof(argv[3]);
+    aUnits  = (Standard_ShortReal) atof(argv[4]);
 
     anInterObj->SetPolygonOffsets(aMode, aFactor, aUnits);
     aContext->UpdateCurrentViewer();

diff --git a/src/VrmlData/VrmlData_Geometry.cxx b/src/VrmlData/VrmlData_Geometry.cxx
index 66ed70cd6317bc841aa65dd99b8ab426919255a4..5154d1a7781d65e2939cfe5a40fff7b176bc745b 100755 (executable)
--- a/src/VrmlData/VrmlData_Geometry.cxx
+++ b/src/VrmlData/VrmlData_Geometry.cxx
@@ -640,7 +640,7 @@ VrmlData_ErrorStatus VrmlData_ArrayVec3d::ReadArray
   if (OK(aStatus, VrmlData_Scene::ReadLine(theBuffer))) {
     // Match the name with the current word in the stream
     if (theName) {
-      const Standard_Integer aNameLen = strlen(theName);
+      const Standard_Size aNameLen = strlen(theName);
       if (strncmp (theBuffer.LinePtr, theName, aNameLen))
         aStatus = VrmlData_VrmlFormatError;
       else

diff --git a/src/VrmlData/VrmlData_Scene.cxx b/src/VrmlData/VrmlData_Scene.cxx
index ee25542727907459d6e03085d989f821641d9ac5..3c568a7067ecb52cecb27da4ccff7e56e9ae4a7b 100755 (executable)
--- a/src/VrmlData/VrmlData_Scene.cxx
+++ b/src/VrmlData/VrmlData_Scene.cxx
@@ -839,7 +839,7 @@ VrmlData_ErrorStatus VrmlData_Scene::ReadArrIndex
             aStatus = VrmlData_UnrecoverableError;
           else {
             for (size_t i = 0; i < aNbBlocks; i++)
-              anArray[i] = vecIndice(i);
+              anArray[i] = vecIndice((Standard_Integer)i);
             theNBlocks = aNbBlocks;
             theArray = anArray;
           } 

diff --git a/src/WNT/WNT_ImageManager.cxx b/src/WNT/WNT_ImageManager.cxx
index 12fbc5a3390f0ab573c371b51891a54f670314f6..2b5d505d4e0df9dd0c4342c3c31dead19f54dba7 100755 (executable)
--- a/src/WNT/WNT_ImageManager.cxx
+++ b/src/WNT/WNT_ImageManager.cxx
@@ -391,7 +391,7 @@ Standard_Integer WNT_ImageManager :: StringHashCode (
 
  } u;
 
- n = strlen ( aString );
+ n = (Standard_Integer) strlen ( aString );
 
  if ( n > 0 ) {
 

diff --git a/src/XSControl/XSControl_TransferReader.cxx b/src/XSControl/XSControl_TransferReader.cxx
index 7d3e78726fff12af624f03f58ae6a053e1648d85..fac3f0174ce85bfc46ca0abef4256f127a89524b 100755 (executable)
--- a/src/XSControl/XSControl_TransferReader.cxx
+++ b/src/XSControl/XSControl_TransferReader.cxx
@@ -895,7 +895,7 @@ Standard_Integer XSControl_TransferReader::TransferOne
          <<"      Ident : "<<lab->ToCString()
          <<  Interface_MSG::Blanks(14 - lab->Length())<<"******\n";
     sout << "******    Type : "<<theModel->TypeName(ent,Standard_False)
-        <<  Interface_MSG::Blanks(44 - strlen(theModel->TypeName(ent,Standard_False)))
+        <<  Interface_MSG::Blanks((Standard_Integer) (44 - strlen(theModel->TypeName(ent,Standard_False))))
        <<  "******";
     sout<<"\n*******************************************************************\n";
   }

diff --git a/src/XSDRAW/XSDRAW.cxx b/src/XSDRAW/XSDRAW.cxx
index dd0d1400efa2c7aba48df9e7de44bd067178e8c1..f7a04e6d8c795e9dd1a7649caa123239a0c96c1d 100755 (executable)
--- a/src/XSDRAW/XSDRAW.cxx
+++ b/src/XSDRAW/XSDRAW.cxx
@@ -241,7 +241,7 @@ void XSDRAW::LoadDraw (Draw_Interpretor& theCommands)
   if (!first || first[0] == '\0') {
     char ligne[80];  ligne[0] = '\0'; char truc;
 //    cin.clear();  cin.get (ligne,79,'\n');
-    cin >> ligne;  int ln = strlen(ligne);
+    cin >> ligne;  Standard_Size ln = strlen(ligne);
     char *ff = &ligne[0], *ss = NULL;
     cin.get(truc);  if (truc != '\n') { cin>>&ligne[ln+1]; ss = &ligne[ln+1]; }
     return  XSDRAW::GetList (ff,ss);