From e35b4caf3341d2cece2b7921f349acd17fb89351 Mon Sep 17 00:00:00 2001 From: isn Date: Mon, 12 Dec 2016 14:44:38 +0300 Subject: [PATCH] porting : eliminate comp. errors --- src/HYDROData/HYDROData_DTM.cxx | 2 +- src/HYDRO_tests/test_HYDROData_DTM.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/HYDROData/HYDROData_DTM.cxx b/src/HYDROData/HYDROData_DTM.cxx index d5bc7480..4b0a1392 100644 --- a/src/HYDROData/HYDROData_DTM.cxx +++ b/src/HYDROData/HYDROData_DTM.cxx @@ -631,7 +631,7 @@ bool IsCooriented( const Handle(HYDROData_Profile)& theProfile1, GCE2d_MakeSegment s2(rp1, rp2); Geom2dAPI_InterCurveCurve inter; - inter.Init(s1, s2); + inter.Init(s1.Value(), s2.Value()); if (inter.NbPoints() == 0) return true; else diff --git a/src/HYDRO_tests/test_HYDROData_DTM.cxx b/src/HYDRO_tests/test_HYDROData_DTM.cxx index fb60fbae..74bf64ba 100644 --- a/src/HYDRO_tests/test_HYDROData_DTM.cxx +++ b/src/HYDRO_tests/test_HYDROData_DTM.cxx @@ -627,13 +627,13 @@ void test_HYDROData_DTM::test_classifier_1() { TCollection_AsciiString fname = REF_DATA_PATH.toLatin1().data(); fname += "/pb_1066.cbf"; - CPPUNIT_ASSERT_EQUAL( DocError_OK, HYDROData_Document::Load( fname.ToCString(), 1 ) ); + CPPUNIT_ASSERT_EQUAL( (int)DocError_OK, (int)HYDROData_Document::Load( fname.ToCString(), 1 ) ); Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1); Handle(HYDROData_CalculationCase) aCase = Handle(HYDROData_CalculationCase)::DownCast( aDoc->FindObjectByName( "Case_1" ) ); - CPPUNIT_ASSERT_EQUAL( Standard_False, aCase.IsNull() ); + CPPUNIT_ASSERT_EQUAL( false, aCase.IsNull() ); std::vector points; points.push_back( gp_XY( 43.4842, 3.33176 ) ); points.push_back( gp_XY( -125.777, 2.24728 ) ); -- 2.39.2