]> SALOME platform Git repositories - modules/kernel.git/commitdiff
Salome HOME
*** empty log message ***
authorageay <ageay>
Fri, 25 Feb 2005 14:41:56 +0000 (14:41 +0000)
committerageay <ageay>
Fri, 25 Feb 2005 14:41:56 +0000 (14:41 +0000)
salome_adm/unix/make_commence.in
src/Container/Makefile.in
src/ResourcesManager/SALOME_ResourcesManager.cxx
src/SALOMEDS/SALOMEDS_UseCaseIterator_i.cxx
src/Utils/Utils_CorbaException.hxx

index 620cfd9fffdf394f9c6c0ae1bdcf71609ab3fb71..0ab96fb52be1acad2204e1a4d5af30eaa2cce443 100644 (file)
@@ -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@
 
index 1ed861ed014cb06824dccabd9b1f2570993797c3..fa963603b2e7c1e5197cd99ab423f60e34a0e6a2 100644 (file)
@@ -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
 
index f84a3586760858222e7b692cd357db1fa716dd65..da3c8997719c5ed064796246f516d69831eba151 100644 (file)
@@ -11,6 +11,7 @@
 #include <iostream>
 #include <string.h>
 #include <map>
+#include <list>
 
 #include <sys/types.h>
 #include <sys/stat.h>
index 38dbd0568f403f2fd229defb7ba15959214b788a..706cba9da3e8cd7fee613e62267abd99ee5be641 100644 (file)
@@ -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
index 5d6d5bf514785a3bee222e2b144228d58c57b68a..c05e8e50ac70e1dbb169cf341976726f05de1010 100644 (file)
@@ -45,7 +45,7 @@
                 throw SALOME::SALOME_Exception(ExDescription); \
               }
 
-#include <ostream.h>
+#include <ostream>
 
 //Dump the CORBA exception type.
 inline std::ostream& operator<<(std::ostream& os, const CORBA::Exception& e)