Porting on linux (CentOS 6.3)

diff --git a/src/GeomAPI/GeomAPI_DataMapOfShapeShape.h b/src/GeomAPI/GeomAPI_DataMapOfShapeShape.h
index 4609bf08fad6d6eae2dfa95dce066b7c1753cc79..e67645e72efdb0a8cb2f8fdee2a617cf30ee28fb 100644 (file)
--- a/src/GeomAPI/GeomAPI_DataMapOfShapeShape.h
+++ b/src/GeomAPI/GeomAPI_DataMapOfShapeShape.h
@@ -26,7 +26,7 @@ class GEOMAPI_EXPORT GeomAPI_DataMapOfShapeShape : public GeomAPI_Interface
   void clear();
 
   /// Size of the map
-  int GeomAPI_DataMapOfShapeShape::size();
+  int size();
 
   /// Adds the Key <K> to  the Map <me>  with  the  Item. Returns True  if the Key  was not already in the map
   bool bind (std::shared_ptr<GeomAPI_Shape> theKey, std::shared_ptr<GeomAPI_Shape> theItem);

diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp
index bb9d5f7f3d1a03584453a3a61b1d248b1bfa57f1..2c055ffd6ccde652922c808d6135edd44103ead9 100644 (file)
--- a/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@ -3,7 +3,7 @@
 #include <PartSet_WidgetSketchLabel.h>
 #include <PartSet_Validators.h>
 #include <PartSet_Tools.h>
-#include <PartSet_WidgetPoint2D.h>
+#include <PartSet_WidgetPoint2d.h>
 #include <PartSet_WidgetPoint2dDistance.h>
 #include <PartSet_WidgetShapeSelector.h>
 

diff --git a/src/PartSet/PartSet_WidgetPoint2d.cpp b/src/PartSet/PartSet_WidgetPoint2d.cpp
index 4e73b4b4c3a7f80c9e60aa1d2f947a633f7b0964..8c7ce43fc482323b5fdcdb79f6936abf7f2f430e 100644 (file)
--- a/src/PartSet/PartSet_WidgetPoint2d.cpp
+++ b/src/PartSet/PartSet_WidgetPoint2d.cpp
@@ -2,8 +2,8 @@
 // Created:     25 Apr 2014
 // Author:      Natalia ERMOLAEVA
 
-#include "PartSet_WidgetPoint2D.h"
-#include "PartSet_Tools.h"
+#include "PartSet_WidgetPoint2d.h"
+#include <PartSet_Tools.h>
 
 #include <XGUI_Workshop.h>
 #include <XGUI_ViewerProxy.h>

diff --git a/src/PartSet/PartSet_WidgetPoint2d.h b/src/PartSet/PartSet_WidgetPoint2d.h
index 444699848f2ebf37e105ec628397fecca2afee23..0e8ae42b158cf60a807716a5268eae56ee111721 100644 (file)
--- a/src/PartSet/PartSet_WidgetPoint2d.h
+++ b/src/PartSet/PartSet_WidgetPoint2d.h
@@ -1,4 +1,4 @@
-// File:        PartSet_WidgetPoint2D.h
+// File:        PartSet_WidgetPoint2d.h
 // Created:     25 Apr 2014
 // Author:      Natalia ERMOLAEVA