Merge from V5_1_3_BR branch (07/12/09)

diff --git a/src/GHS3DPlugin_GHS3D.cxx b/src/GHS3DPlugin_GHS3D.cxx
index 481b72e4142d7c28b88851a8af2a8261e6e75794..dc7045d2c9b1f4b96b71969853b503d4a975bdc4 100644 (file)
--- a/src/GHS3DPlugin_GHS3D.cxx
+++ b/src/GHS3DPlugin_GHS3D.cxx
@@ -28,6 +28,8 @@
 #include "GHS3DPlugin_Hypothesis.hxx"
 
 
+#include <Basics_Utils.hxx>
+
 #include "SMESH_Gen.hxx"
 #include "SMESH_Mesh.hxx"
 #include "SMESH_Comment.hxx"
@@ -745,6 +747,7 @@ static bool readResultFile(const int                       fileOpen,
                            int                             nbEnforcedVertices)
 {
   MESSAGE("GHS3DPlugin_GHS3D::readResultFile()");
+  Kernel_Utils::Localizer loc;
   struct stat status;
   size_t      length;
 
@@ -991,6 +994,7 @@ static bool readResultFile(const int                      fileOpen,
                            vector <const SMDS_MeshNode*>& theNodeByGhs3dId,
                            int                            nbEnforcedVertices) {
 
+  Kernel_Utils::Localizer loc;
   struct stat  status;
   size_t       length;
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 1986df6830937670b4bc743bc2010c5da28a1f07..35b69da6a0c5d302d2b4e7adaf89b84e5fb69574 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -63,4 +63,4 @@ libGHS3DEngine_la_LDFLAGS  = \
        ../idl/libSalomeIDLGHS3DPLUGIN.la \
        $(CAS_KERNEL) -lTKBRep -lTKG2d -lTKG3d -lTKTopAlgo -lTKGeomBase -lTKGeomAlgo \
        $(SMESH_LDFLAGS) -lSMESHimpl -lSMESHEngine -lSMESHDS -lSMDS \
-       $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSALOMELocalTrace
+       $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSALOMELocalTrace -lSALOMEBasics