From 3dfba26b7ef8c1c65b6d15ffa1bf807e9a202f62 Mon Sep 17 00:00:00 2001 From: apo Date: Tue, 28 Dec 2004 13:35:55 +0000 Subject: [PATCH] [Bug PAL7252] DEVELOPMENT: Porting to MED2.2 --- src/MEDWrapper/Makefile.in | 26 +++++++------------------- src/Utils/Utils_CorbaException.hxx | 6 ++++-- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/src/MEDWrapper/Makefile.in b/src/MEDWrapper/Makefile.in index 71cbd7cbd..c6a625e10 100644 --- a/src/MEDWrapper/Makefile.in +++ b/src/MEDWrapper/Makefile.in @@ -1,4 +1,4 @@ -# VISU OBJECT : interactive object for VISU entities implementation +# # # Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -21,8 +21,10 @@ # # # -# File : Makefile.in -# Module : VISU +# File : +# Author : +# Module : +# $Header$ top_srcdir=@top_srcdir@ top_builddir=../.. @@ -32,20 +34,6 @@ VPATH=.:@srcdir@:@top_srcdir@/idl @COMMENCE@ -EXPORT_HEADERS = MED_Common.hxx MED_Utilities.hxx MEDA_Structures.hxx MEDA_Wrapper.hxx MEDA_Algorithm.hxx +SUBDIRS = Base V2_1 V2_2 Factory -# Libraries targets - -LIB = libMEDWrapper.la -LIB_SRC = MED_Structures.cxx MED_Wrapper.cxx MED_Utilities.cxx \ - MEDA_Structures.cxx MEDA_Wrapper.cxx MEDA_Algorithm.cxx - -# Executables targets -BIN = MED_Test MEDA_Test MEDA_Test1 -BIN_SRC = - -CPPFLAGS+= $(BOOST_CPPFLAGS) $(MED2_INCLUDES) - -LDFLAGS+= $(MED2_LIBS) $(HDF5_LIBS) - -@CONCLUDE@ +@MODULE@ diff --git a/src/Utils/Utils_CorbaException.hxx b/src/Utils/Utils_CorbaException.hxx index 44d642b86..5d6d5bf51 100644 --- a/src/Utils/Utils_CorbaException.hxx +++ b/src/Utils/Utils_CorbaException.hxx @@ -45,9 +45,10 @@ throw SALOME::SALOME_Exception(ExDescription); \ } -#include +#include + //Dump the CORBA exception type. -static std::ostream& operator<<(std::ostream& os, const CORBA::Exception& e) +inline std::ostream& operator<<(std::ostream& os, const CORBA::Exception& e) { CORBA::Any tmp; tmp<<= e; @@ -63,4 +64,5 @@ static std::ostream& operator<<(std::ostream& os, const CORBA::Exception& e) return os; } + #endif -- 2.39.2