From 2af758c692b3068f5b13b7346d039630794f666a Mon Sep 17 00:00:00 2001 From: prascle Date: Wed, 19 Dec 2012 16:31:35 +0000 Subject: [PATCH] PR: fix previous commit --- src/SMESHUtils/SMESH_TryCatch.cxx | 6 ++---- src/SMESHUtils/SMESH_TryCatch.hxx | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/SMESHUtils/SMESH_TryCatch.cxx b/src/SMESHUtils/SMESH_TryCatch.cxx index 3a1da1885..78808cf1c 100644 --- a/src/SMESHUtils/SMESH_TryCatch.cxx +++ b/src/SMESHUtils/SMESH_TryCatch.cxx @@ -21,14 +21,12 @@ #include "SMESH_TryCatch.hxx" -using namespace SMESH; - -void throwSalomeEx(const char* txt) +void SMESH::throwSalomeEx(const char* txt) { throw SALOME_Exception( txt ); } -inline void doNothing(const char* txt) +void SMESH::doNothing(const char* txt) { MESSAGE( txt << " " << __FILE__ << ": " << __LINE__ ); } diff --git a/src/SMESHUtils/SMESH_TryCatch.hxx b/src/SMESHUtils/SMESH_TryCatch.hxx index f8e2fe2ad..8f1746c83 100644 --- a/src/SMESHUtils/SMESH_TryCatch.hxx +++ b/src/SMESHUtils/SMESH_TryCatch.hxx @@ -103,7 +103,7 @@ namespace SMESH { void throwSalomeEx(const char* txt); - inline void doNothing(const char* txt); + void doNothing(const char* txt); } #endif -- 2.39.2