0023346: MSVC++ Error C2664: 'AIS_InteractiveObject::PolygonOffsets': conversion...

Changed Standard_Real to Standard_ShortReal.

Modify test case offset shape_type_i D6

diff --git a/samples/mfc/standard/04_Viewer3d/src/OffsetDlg.cpp b/samples/mfc/standard/04_Viewer3d/src/OffsetDlg.cpp
index 51f6aa7b4c120cd1d8b3b6ddc1e44885bbb61ff4..34b9966b8e9b57e04308a69e091354b134f54ccc 100755 (executable)
--- a/samples/mfc/standard/04_Viewer3d/src/OffsetDlg.cpp
+++ b/samples/mfc/standard/04_Viewer3d/src/OffsetDlg.cpp
@@ -187,12 +187,12 @@ void COffsetDlg::SetOffsets(Standard_Real theFactor, Standard_Real theUnits)
 void COffsetDlg::UpdateValues()
 {
        Standard_Integer aOffsetMode;
-       Standard_Real aBoxFactor = 0;
-       Standard_Real aCylFactor = 0;
-       Standard_Real aSphereFactor = 0;
-       Standard_Real aCylUnits = 0;
-       Standard_Real aSphereUnits = 0;
-       Standard_Real aBoxUnits = 0;
+       Standard_ShortReal aBoxFactor = 0;
+       Standard_ShortReal aCylFactor = 0;
+       Standard_ShortReal aSphereFactor = 0;
+       Standard_ShortReal aCylUnits = 0;
+       Standard_ShortReal aSphereUnits = 0;
+       Standard_ShortReal aBoxUnits = 0;
 
        Handle(AIS_InteractiveContext) aAISContext = myDoc->GetAISContext();
 

diff --git a/samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.cpp b/samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.cpp
index c0fa578b3270175978af62ee74b91539052bde8b..021bd182ac7158f3db4f7a06a8193d827ea81613 100755 (executable)
--- a/samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.cpp
+++ b/samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.cpp
@@ -348,10 +348,10 @@ void CViewer3dDoc::OnPolygonOffsets()
 void CViewer3dDoc::OnUpdatePolygonOffsets(CCmdUI* pCmdUI) 
 {
        Standard_Integer aOffsetMode;
-       Standard_Real aFactor;
-       Standard_Real aCylUnits = 0;
-       Standard_Real aSphereUnits = 0;
-       Standard_Real aBoxUnits = 0;
+       Standard_ShortReal aFactor;
+       Standard_ShortReal aCylUnits = 0;
+       Standard_ShortReal aSphereUnits = 0;
+       Standard_ShortReal aBoxUnits = 0;
 
        BOOL IsOverlappedCylinderDisplayed = myAISContext->IsDisplayed(myOverlappedCylinder);
        BOOL IsOverlappedSphereDisplayed = myAISContext->IsDisplayed(myOverlappedSphere);

diff --git a/tests/offset/shape_type_i/D6 b/tests/offset/shape_type_i/D6
index 0026f6ea799df688a8298a5096b9dec500b6467d..81b1e96a12e9a3e6fe19658bc9267d3ba4352b60 100644 (file)
--- a/tests/offset/shape_type_i/D6
+++ b/tests/offset/shape_type_i/D6
@@ -1,4 +1,5 @@
-puts "TODO OCC23068 Mandriva2010: Error: bsection of result and s is not equal zero"
+puts "TODO ?OCC23068 Mandriva2010: Error: bsection of result and s is not equal zero"
+puts "TODO ?OCC23068 Mandriva2010: Faulty shapes in variables faulty_1 to faulty_2"
 puts "TODO OCC23068 Mandriva2010: Error : The volume of result shape"
 
 ellipse w1 0 0 0 15 10