From 498df5aa1ff98adc001f925c44394555589e91b4 Mon Sep 17 00:00:00 2001
From: yfr <yfr@opencascade.com>
Date: Mon, 19 Jul 2004 14:36:32 +0000
Subject: [PATCH] DCQ: prepare V2.0.0

---
 src/GEOM/GEOM_Gen_i.cc | 17 +++++++++++++----
 src/OBJECT/Makefile.in |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/GEOM/GEOM_Gen_i.cc b/src/GEOM/GEOM_Gen_i.cc
index 41506b1e7..aec7970cd 100644
--- a/src/GEOM/GEOM_Gen_i.cc
+++ b/src/GEOM/GEOM_Gen_i.cc
@@ -2735,12 +2735,13 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::ImportIGES(const char* filename)
       THROW_SALOME_CORBA_EXCEPTION("Error in reading import file", SALOME::BAD_PARAM);    }
     
     MESSAGE("ImportIGES : all Geometry Transfer" << endl ) ;
-    //OCC 5.1.2 porting
-//     aReader.Clear();
-//     aReader.TransferRoots(false);
+#if OCC_VERSION_MAJOR >= 5
     aReader.ClearShapes();
     aReader.TransferRoots();
-
+#else
+    aReader.Clear();
+    aReader.TransferRoots(false);
+#endif
     MESSAGE("ImportIGES : count of shapes produced = " << aReader.NbShapes() << endl );    
     TopoDS_Shape shape = aReader.OneShape();
 
@@ -4891,7 +4892,11 @@ GEOM::GEOM_Shape_ptr  GEOM_Gen_i::MakeFillet( GEOM::GEOM_Shape_ptr shape,
 	fill.Add(E);
       }
       for (int i = 1;i<=fill.NbContours();i++) {
+#if OCC_VERSION_MAJOR >= 5
 	fill.SetRadius(radius,i,i);
+#else
+	fill.SetRadius(radius,i);
+#endif
       }
       tds = fill.Shape();
       
@@ -4906,7 +4911,11 @@ GEOM::GEOM_Shape_ptr  GEOM_Gen_i::MakeFillet( GEOM::GEOM_Shape_ptr shape,
 	}
       }
       for (int i = 1;i<=fill.NbContours();i++) {
+#if OCC_VERSION_MAJOR >= 5
 	fill.SetRadius(radius,i,i);
+#else
+	fill.SetRadius(radius,i);
+#endif
       }
       tds = fill.Shape();
     }
diff --git a/src/OBJECT/Makefile.in b/src/OBJECT/Makefile.in
index 154c41d95..29da193a2 100644
--- a/src/OBJECT/Makefile.in
+++ b/src/OBJECT/Makefile.in
@@ -57,7 +57,7 @@ BIN_SRC	=
 
 CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
 CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome
-LDFLAGS+=$(QT_MT_LIBS) $(VTK_LIBS) $(OGL_LIBS) $(PYTHON_LIBS) -lSalomeObject -L${KERNEL_ROOT_DIR}/lib/salome
+LDFLAGS+=$(PYTHON_LIBS) $(QT_MT_LIBS) $(VTK_LIBS) $(OGL_LIBS) -lSalomeObject -L${KERNEL_ROOT_DIR}/lib/salome
 %_moc.cxx: %.h
 	$(MOC) $< -o $@
 
-- 
2.39.2