[Bug PAL7252] DEVELOPMENT: Porting to MED2.2

diff --git a/src/MEDWrapper/Makefile.in b/src/MEDWrapper/Makefile.in
index 71cbd7cbd7523727d40ef73c6467cbc7ab5d0200..c6a625e10503ceeb48bb6d6dba5e62596245cc3c 100644 (file)
--- 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 44d642b86fe0f7dba6b0f832051b6979f0080b2f..5d6d5bf514785a3bee222e2b144228d58c57b68a 100644 (file)
--- a/src/Utils/Utils_CorbaException.hxx
+++ b/src/Utils/Utils_CorbaException.hxx
@@ -45,9 +45,10 @@
                 throw SALOME::SALOME_Exception(ExDescription); \
               }
 
-#include <iostream>
+#include <ostream.h>
+
 //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