From e145d04c8de267f40223595620a0b0d190814815 Mon Sep 17 00:00:00 2001 From: Pawel Kowalski Date: Fri, 27 Jul 2012 16:52:37 +0400 Subject: [PATCH] 0023346: MSVC++ Error C2664: 'AIS_InteractiveObject::PolygonOffsets': conversion from 'Standard_Real' in 'Standard_ShortReal &' Changed Standard_Real to Standard_ShortReal. Modify test case offset shape_type_i D6 --- samples/mfc/standard/04_Viewer3d/src/OffsetDlg.cpp | 12 ++++++------ samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.cpp | 8 ++++---- tests/offset/shape_type_i/D6 | 3 ++- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/samples/mfc/standard/04_Viewer3d/src/OffsetDlg.cpp b/samples/mfc/standard/04_Viewer3d/src/OffsetDlg.cpp index 51f6aa7b4c..34b9966b8e 100755 --- 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 c0fa578b32..021bd182ac 100755 --- 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 0026f6ea79..81b1e96a12 100644 --- 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 -- 2.20.1