From: prascle <prascle>
Date: Tue, 18 Dec 2012 09:25:28 +0000 (+0000)
Subject: PR: compilation problem on ubuntu 12.04
X-Git-Tag: pluginMGCleaner~226
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=500aed035128b0bc13fb56539268575f9d8fd217;p=modules%2Fsmesh.git

PR: compilation problem on ubuntu 12.04
---

diff --git a/src/SMESHUtils/Makefile.am b/src/SMESHUtils/Makefile.am
index 9158a2b5b..7f5cac140 100644
--- a/src/SMESHUtils/Makefile.am
+++ b/src/SMESHUtils/Makefile.am
@@ -45,6 +45,7 @@ dist_libSMESHUtils_la_SOURCES = \
 	SMESH_Quadtree.cxx \
 	SMESH_Octree.cxx \
 	SMESH_OctreeNode.cxx \
+	SMESH_TryCatch.cxx \
 	SMESH_File.cxx
 
 # additionnal information to compile and link file
diff --git a/src/SMESHUtils/SMESH_TryCatch.cxx b/src/SMESHUtils/SMESH_TryCatch.cxx
new file mode 100644
index 000000000..3a1da1885
--- /dev/null
+++ b/src/SMESHUtils/SMESH_TryCatch.cxx
@@ -0,0 +1,35 @@
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+
+#include "SMESH_TryCatch.hxx"
+
+using namespace SMESH;
+
+void throwSalomeEx(const char* txt)
+{
+  throw SALOME_Exception( txt );
+}
+
+inline void doNothing(const char* txt)
+{
+  MESSAGE( txt << " " << __FILE__ << ": " << __LINE__ );
+}
+
diff --git a/src/SMESHUtils/SMESH_TryCatch.hxx b/src/SMESHUtils/SMESH_TryCatch.hxx
index 838d98ae4..f8e2fe2ad 100644
--- a/src/SMESHUtils/SMESH_TryCatch.hxx
+++ b/src/SMESHUtils/SMESH_TryCatch.hxx
@@ -99,17 +99,11 @@
 
 //-------------------------------------------------------------------------------------
 // Functions that can be used as an argument of SMESH_CATCH
+
 namespace SMESH
 {
-  void throwSalomeEx(const char* txt)
-  {
-    throw SALOME_Exception( txt );
-  }
-
-  inline void doNothing(const char* txt)
-  {
-    MESSAGE( txt << " " << __FILE__ << ": " << __LINE__ );
-  }
+  void throwSalomeEx(const char* txt);
+  inline void doNothing(const char* txt);
 }
 
 #endif