From adb2d3b4b330bb07dc446efe1b5370c330f73fe2 Mon Sep 17 00:00:00 2001 From: ageay Date: Fri, 25 Feb 2005 14:41:56 +0000 Subject: [PATCH] *** empty log message *** --- salome_adm/unix/make_commence.in | 1 + src/Container/Makefile.in | 2 +- src/ResourcesManager/SALOME_ResourcesManager.cxx | 1 + src/SALOMEDS/SALOMEDS_UseCaseIterator_i.cxx | 3 +-- src/Utils/Utils_CorbaException.hxx | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/salome_adm/unix/make_commence.in b/salome_adm/unix/make_commence.in index 620cfd9ff..0ab96fb52 100644 --- a/salome_adm/unix/make_commence.in +++ b/salome_adm/unix/make_commence.in @@ -192,6 +192,7 @@ CXXFLAGS+= $(CORBA_CXXFLAGS) # add corba libs when link salome application ! #LDFLAGS+= $(CORBA_LIBS) LIBS+=$(CORBA_LIBS) +LIBSFORBIN+=$(CORBA_LIBS) DOXYGEN = @DOXYGEN@ diff --git a/src/Container/Makefile.in b/src/Container/Makefile.in index 1ed861ed0..fa963603b 100644 --- a/src/Container/Makefile.in +++ b/src/Container/Makefile.in @@ -49,7 +49,7 @@ LIB_SERVER_IDL = SALOME_Registry.idl SALOME_Component.idl SALOME_ContainerManage LIB_CLIENT_IDL = # Executables targets -BIN = SALOME_Container +BIN = SALOME_Container SALOME_ContainerManagerServer BIN_SRC = SALOME_Container_SignalsHandler.cxx BIN_SERVER_IDL = SALOME_Component.idl SALOME_ContainerManager.idl diff --git a/src/ResourcesManager/SALOME_ResourcesManager.cxx b/src/ResourcesManager/SALOME_ResourcesManager.cxx index f84a35867..da3c89977 100644 --- a/src/ResourcesManager/SALOME_ResourcesManager.cxx +++ b/src/ResourcesManager/SALOME_ResourcesManager.cxx @@ -11,6 +11,7 @@ #include #include #include +#include #include #include diff --git a/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.cxx b/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.cxx index 38dbd0568..706cba9da 100644 --- a/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.cxx +++ b/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.cxx @@ -8,12 +8,11 @@ // Author : Yves FRICAUD // Module : SALOME -using namespace std; #include "SALOMEDS_UseCaseIterator_i.hxx" #include "SALOMEDS_SObject_i.hxx" #include "utilities.h" - +using namespace std; //============================================================================ /*! Function : constructor diff --git a/src/Utils/Utils_CorbaException.hxx b/src/Utils/Utils_CorbaException.hxx index 5d6d5bf51..c05e8e50a 100644 --- a/src/Utils/Utils_CorbaException.hxx +++ b/src/Utils/Utils_CorbaException.hxx @@ -45,7 +45,7 @@ throw SALOME::SALOME_Exception(ExDescription); \ } -#include +#include //Dump the CORBA exception type. inline std::ostream& operator<<(std::ostream& os, const CORBA::Exception& e) -- 2.39.2