From 23325bbf08df0f21b1eab1097bd8825034b7762d Mon Sep 17 00:00:00 2001 From: prascle Date: Mon, 16 Apr 2007 13:39:30 +0000 Subject: [PATCH] mergefrom BR_Dev_For_4_0 tag mergeto_BR_For40_DSC_16apr07 --- idl/Makefile.am | 14 ++++- salome_adm/unix/config_files/config.guess | 21 +++---- salome_adm/unix/config_files/config.sub | 58 ++++++++----------- src/Communication/SALOME_Comm_i.hxx | 4 +- src/Communication/SALOME_Matrix_i.hxx | 4 +- src/Container/SALOME_Component_i.hxx | 2 +- src/Container/SALOME_ContainerManager.hxx | 3 +- src/Container/SALOME_Container_i.hxx | 2 +- src/Container/SALOME_FileRef_i.hxx | 2 +- src/Container/SALOME_FileTransfer_i.hxx | 2 +- src/Logger/SALOME_Logger_Server.hxx | 3 +- .../SALOME_ModuleCatalog_Acomponent_impl.hxx | 3 +- .../SALOME_ModuleCatalog_impl.hxx | 3 +- src/NamingService/Test/NamingServiceTest.hxx | 4 +- src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx | 2 +- src/SALOMEDS/SALOMEDS_Callback_i.hxx | 2 +- src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx | 2 +- src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx | 2 +- src/SALOMEDS/SALOMEDS_SAttribute_i.hxx | 2 +- .../SALOMEDS_SComponentIterator_i.hxx | 2 +- src/SALOMEDS/SALOMEDS_SObject_i.hxx | 2 +- src/SALOMEDS/SALOMEDS_StudyBuilder.cxx | 2 +- src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx | 3 +- src/SALOMEDS/SALOMEDS_StudyManager_i.hxx | 4 +- src/SALOMEDS/SALOMEDS_Study_i.hxx | 3 +- src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.hxx | 2 +- src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx | 2 +- src/SALOMEDS/Test/Makefile.am | 43 +++++++++++++- .../SALOMEDSImpl_StudyBuilder.cxx | 8 ++- .../SALOMEDSImpl_StudyManager.cxx | 8 +-- 30 files changed, 124 insertions(+), 90 deletions(-) diff --git a/idl/Makefile.am b/idl/Makefile.am index ce328ceaf..06d198355 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -90,9 +90,11 @@ BASEIDL_SOURCES =\ DSC_EnginesSK.cc \ SALOME_PortsSK.cc \ Calcium_PortsSK.cc \ - Calcium_PortsDynSK.cc \ Palm_PortsSK.cc +DYNIDL_SOURCES=\ + Calcium_PortsDynSK.cc + MPIIDL_SOURCES = \ SALOME_MPIObjectSK.cc \ SALOME_MPIContainerSK.cc \ @@ -103,8 +105,16 @@ if MPI_IS_OK IDL_SOURCES += $(MPIIDL_SOURCES) endif + +STATIDL_SOURCES=$(BASEIDL_SOURCES) +if MPI_IS_OK + STATIDL_SOURCES += $(MPIIDL_SOURCES) +endif + +IDL_SOURCES += $(DYNIDL_SOURCES) + # also install all generated headers to use result library from another modules -#salomeinclude_DATA= $(IDL_SOURCES:%SK.cc=%.hh) +salomeinclude_DATA= $(STATIDL_SOURCES:%SK.cc=%.hh) if WITH_PACO_PARALLEL PAR = SALOME_ComponentPaCO.h SALOME_ComponentPaCO.cc \ diff --git a/salome_adm/unix/config_files/config.guess b/salome_adm/unix/config_files/config.guess index 396482d6c..c38553dc7 100755 --- a/salome_adm/unix/config_files/config.guess +++ b/salome_adm/unix/config_files/config.guess @@ -1,10 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2006-07-02' +timestamp='2006-02-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -211,7 +210,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} exit ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} + echo powerppc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -771,8 +770,6 @@ EOF case ${UNAME_MACHINE} in pc98) echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac @@ -783,6 +780,9 @@ EOF i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS_NT-*:*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 @@ -790,10 +790,10 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[3456]*) + x86:Interix*:[345]*) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T:Interix*:[3456]*) + EM64T:Interix*:[345]*) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) @@ -831,9 +831,6 @@ EOF arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu exit ;; @@ -992,7 +989,7 @@ EOF LIBC=gnulibc1 # endif #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun) LIBC=gnu #else LIBC=gnuaout diff --git a/salome_adm/unix/config_files/config.sub b/salome_adm/unix/config_files/config.sub index fab0aa355..ad9f39571 100755 --- a/salome_adm/unix/config_files/config.sub +++ b/salome_adm/unix/config_files/config.sub @@ -1,10 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2006-09-20' +timestamp='2006-02-23' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -241,7 +240,7 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ @@ -249,8 +248,7 @@ case $basic_machine in | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -276,19 +274,21 @@ case $basic_machine in | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | score \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ + | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b \ + | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; + m32c) + basic_machine=$basic_machine-unknown + ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -318,7 +318,7 @@ case $basic_machine in | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ + | avr-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ @@ -329,7 +329,7 @@ case $basic_machine in | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32c-* | m32r-* | m32rle-* \ + | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -358,21 +358,23 @@ case $basic_machine in | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; + m32c-*) + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -910,10 +912,6 @@ case $basic_machine in sb1el) basic_machine=mipsisa64sb1el-unknown ;; - sde) - basic_machine=mipsisa32-sde - os=-elf - ;; sei) basic_machine=mips-sei os=-seiux @@ -1130,7 +1128,7 @@ case $basic_machine in sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; cydra) @@ -1219,7 +1217,7 @@ case $os in | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers*) + | -skyos* | -haiku* | -rdos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1371,12 +1369,6 @@ else # system, and we'll never get to this point. case $basic_machine in - score-*) - os=-elf - ;; - spu-*) - os=-elf - ;; *-acorn) os=-riscix1.2 ;; @@ -1386,9 +1378,9 @@ case $basic_machine in arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 diff --git a/src/Communication/SALOME_Comm_i.hxx b/src/Communication/SALOME_Comm_i.hxx index 4bcde2ef4..6664fc4c0 100644 --- a/src/Communication/SALOME_Comm_i.hxx +++ b/src/Communication/SALOME_Comm_i.hxx @@ -36,8 +36,8 @@ Generic servant class for senders that factorizes all the common methods and attributes necessary to senders. All servant classes for senders have to inheritate from it. */ -class COMMUNICATION_EXPORT SALOME_Sender_i : public virtual POA_SALOME::Sender, - public PortableServer::RefCountServantBase { +class COMMUNICATION_EXPORT SALOME_Sender_i : public virtual POA_SALOME::Sender +{ protected: /*! Pointer to the generic array to transmit*/ const void *_tabToSend; diff --git a/src/Communication/SALOME_Matrix_i.hxx b/src/Communication/SALOME_Matrix_i.hxx index 3b3d33af7..26e8729a8 100644 --- a/src/Communication/SALOME_Matrix_i.hxx +++ b/src/Communication/SALOME_Matrix_i.hxx @@ -24,8 +24,8 @@ #include CORBA_SERVER_HEADER(SALOME_Comm) #include "SALOMEMultiComm.hxx" -class SALOME_Matrix_i : public virtual POA_SALOME::Matrix, - public PortableServer::RefCountServantBase { +class SALOME_Matrix_i : public virtual POA_SALOME::Matrix +{ private: const double *_tabToSend; int _nbOfRow; diff --git a/src/Container/SALOME_Component_i.hxx b/src/Container/SALOME_Component_i.hxx index 5107cb59e..3bd3f85d0 100644 --- a/src/Container/SALOME_Component_i.hxx +++ b/src/Container/SALOME_Component_i.hxx @@ -49,7 +49,7 @@ class Engines_Container_i; class CONTAINER_EXPORT Engines_Component_i: public virtual POA_Engines::Component, - public virtual PortableServer::RefCountServantBase + public virtual PortableServer::ServantBase { public: Engines_Component_i(); diff --git a/src/Container/SALOME_ContainerManager.hxx b/src/Container/SALOME_ContainerManager.hxx index 9369135e9..9c24963f7 100644 --- a/src/Container/SALOME_ContainerManager.hxx +++ b/src/Container/SALOME_ContainerManager.hxx @@ -33,8 +33,7 @@ class SALOME_NamingService; class CONTAINER_EXPORT SALOME_ContainerManager: - public POA_Engines::ContainerManager, - public PortableServer::RefCountServantBase + public POA_Engines::ContainerManager { public: diff --git a/src/Container/SALOME_Container_i.hxx b/src/Container/SALOME_Container_i.hxx index 181c4f84e..fe32eba83 100644 --- a/src/Container/SALOME_Container_i.hxx +++ b/src/Container/SALOME_Container_i.hxx @@ -49,7 +49,7 @@ class SALOME_NamingService; class CONTAINER_EXPORT Engines_Container_i: public virtual POA_Engines::Container, - public virtual PortableServer::RefCountServantBase + public virtual PortableServer::ServantBase { public: Engines_Container_i(); diff --git a/src/Container/SALOME_FileRef_i.hxx b/src/Container/SALOME_FileRef_i.hxx index 61b3f52f2..3e32964a5 100644 --- a/src/Container/SALOME_FileRef_i.hxx +++ b/src/Container/SALOME_FileRef_i.hxx @@ -36,7 +36,7 @@ class CONTAINER_EXPORT fileRef_i: public virtual POA_Engines::fileRef, - public virtual PortableServer::RefCountServantBase + public virtual PortableServer::ServantBase { public: fileRef_i(); diff --git a/src/Container/SALOME_FileTransfer_i.hxx b/src/Container/SALOME_FileTransfer_i.hxx index c0ecb18e6..f35a5582d 100644 --- a/src/Container/SALOME_FileTransfer_i.hxx +++ b/src/Container/SALOME_FileTransfer_i.hxx @@ -36,7 +36,7 @@ class CONTAINER_EXPORT fileTransfer_i: public virtual POA_Engines::fileTransfer, - public virtual PortableServer::RefCountServantBase + public virtual PortableServer::ServantBase { public: fileTransfer_i(); diff --git a/src/Logger/SALOME_Logger_Server.hxx b/src/Logger/SALOME_Logger_Server.hxx index 9f7a16a83..5b1f13f93 100644 --- a/src/Logger/SALOME_Logger_Server.hxx +++ b/src/Logger/SALOME_Logger_Server.hxx @@ -32,8 +32,7 @@ class LOGGER_EXPORT Logger : - public POA_SALOME_Logger::Logger, - public PortableServer::RefCountServantBase + public POA_SALOME_Logger::Logger { public: //constructor w/o parameters diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx index c6ce34ea5..c7b580a17 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx @@ -36,8 +36,7 @@ #include CORBA_SERVER_HEADER(SALOME_ModuleCatalog) -class MODULECATALOG_EXPORT SALOME_ModuleCatalog_AcomponentImpl: public POA_SALOME_ModuleCatalog::Acomponent, - public PortableServer::RefCountServantBase +class MODULECATALOG_EXPORT SALOME_ModuleCatalog_AcomponentImpl: public POA_SALOME_ModuleCatalog::Acomponent { public: //! standard constructor diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx index 92976b7e3..5dad3bacf 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx @@ -40,8 +40,7 @@ #include #include CORBA_SERVER_HEADER(SALOME_ModuleCatalog) -class MODULECATALOG_EXPORT SALOME_ModuleCatalogImpl: public POA_SALOME_ModuleCatalog::ModuleCatalog, - public PortableServer::RefCountServantBase +class MODULECATALOG_EXPORT SALOME_ModuleCatalogImpl: public POA_SALOME_ModuleCatalog::ModuleCatalog { public: //! standard constructor diff --git a/src/NamingService/Test/NamingServiceTest.hxx b/src/NamingService/Test/NamingServiceTest.hxx index d41ddcae3..b471a9449 100644 --- a/src/NamingService/Test/NamingServiceTest.hxx +++ b/src/NamingService/Test/NamingServiceTest.hxx @@ -28,7 +28,7 @@ #include CORBA_SERVER_HEADER(nstest) class NSTEST_echo_i : public virtual POA_NSTEST::echo, - public virtual PortableServer::RefCountServantBase + public virtual PortableServer::ServantBase { public: NSTEST_echo_i(); @@ -40,7 +40,7 @@ private: }; class NSTEST_aFactory_i : public virtual POA_NSTEST::aFactory, - public virtual PortableServer::RefCountServantBase + public virtual PortableServer::ServantBase { public: NSTEST_aFactory_i(); diff --git a/src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx b/src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx index 950181786..26455a9f3 100644 --- a/src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx +++ b/src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx @@ -35,7 +35,7 @@ #include class SALOMEDS_BasicAttribute_i: public POA_SALOMEDS::BasicAttribute, - public PortableServer::RefCountServantBase { + public PortableServer::ServantBase { protected: TDF_Label _Lab; diff --git a/src/SALOMEDS/SALOMEDS_Callback_i.hxx b/src/SALOMEDS/SALOMEDS_Callback_i.hxx index ffc6e6db2..d6f755437 100644 --- a/src/SALOMEDS/SALOMEDS_Callback_i.hxx +++ b/src/SALOMEDS/SALOMEDS_Callback_i.hxx @@ -16,7 +16,7 @@ #include CORBA_SERVER_HEADER(SALOMEDS) class SALOMEDS_Callback_i: public virtual POA_SALOMEDS::Callback, - public virtual PortableServer::RefCountServantBase + public virtual PortableServer::ServantBase { private: SALOMEDS::UseCaseBuilder_var _builder; diff --git a/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx b/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx index 7092d89f3..d2af3944d 100644 --- a/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx +++ b/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx @@ -37,7 +37,7 @@ #include class SALOMEDS_ChildIterator_i: public virtual POA_SALOMEDS::ChildIterator, - public virtual PortableServer::RefCountServantBase, + public virtual PortableServer::ServantBase, public virtual SALOME::GenericObj_i { private: diff --git a/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx b/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx index 32176a41a..093ed285a 100644 --- a/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx +++ b/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx @@ -33,7 +33,7 @@ #include "SALOMEDSImpl_GenericAttribute.hxx" class Standard_EXPORT SALOMEDS_GenericAttribute_i: public virtual POA_SALOMEDS::GenericAttribute, - public virtual PortableServer::RefCountServantBase, + public virtual PortableServer::ServantBase, public virtual SALOME::GenericObj_i { diff --git a/src/SALOMEDS/SALOMEDS_SAttribute_i.hxx b/src/SALOMEDS/SALOMEDS_SAttribute_i.hxx index 4652d95ee..0b1106ff0 100644 --- a/src/SALOMEDS/SALOMEDS_SAttribute_i.hxx +++ b/src/SALOMEDS/SALOMEDS_SAttribute_i.hxx @@ -43,7 +43,7 @@ #include class SALOMEDS_SAttribute_i: public POA_IStudy::SAttribute, - public PortableServer::RefCountServantBase { + public PortableServer::ServantBase { private: CORBA::ORB_ptr _orb; char* _Type; diff --git a/src/SALOMEDS/SALOMEDS_SComponentIterator_i.hxx b/src/SALOMEDS/SALOMEDS_SComponentIterator_i.hxx index dba9faad6..3335a1a28 100644 --- a/src/SALOMEDS/SALOMEDS_SComponentIterator_i.hxx +++ b/src/SALOMEDS/SALOMEDS_SComponentIterator_i.hxx @@ -37,7 +37,7 @@ #include "SALOMEDSImpl_SComponentIterator.hxx" class SALOMEDS_SComponentIterator_i:public virtual POA_SALOMEDS::SComponentIterator, - public virtual PortableServer::RefCountServantBase, + public virtual PortableServer::ServantBase, public virtual SALOME::GenericObj_i { diff --git a/src/SALOMEDS/SALOMEDS_SObject_i.hxx b/src/SALOMEDS/SALOMEDS_SObject_i.hxx index 2a492fc22..b836a2bee 100644 --- a/src/SALOMEDS/SALOMEDS_SObject_i.hxx +++ b/src/SALOMEDS/SALOMEDS_SObject_i.hxx @@ -36,7 +36,7 @@ #include "SALOMEDSImpl_SObject.hxx" class Standard_EXPORT SALOMEDS_SObject_i: public virtual POA_SALOMEDS::SObject, - public virtual PortableServer::RefCountServantBase, + public virtual PortableServer::ServantBase, public virtual SALOME::GenericObj_i { protected: diff --git a/src/SALOMEDS/SALOMEDS_StudyBuilder.cxx b/src/SALOMEDS/SALOMEDS_StudyBuilder.cxx index 277ceebb9..2d5a3901c 100644 --- a/src/SALOMEDS/SALOMEDS_StudyBuilder.cxx +++ b/src/SALOMEDS/SALOMEDS_StudyBuilder.cxx @@ -98,7 +98,7 @@ _PTR(SComponent) SALOMEDS_StudyBuilder::NewComponent(const std::string& Componen void SALOMEDS_StudyBuilder::DefineComponentInstance (const _PTR(SComponent)& theSCO, const std::string& ComponentIOR) { - if(theSCO) return; + if(!theSCO) return; SALOMEDS_SComponent* aSCO = dynamic_cast(theSCO.get()); if (_isLocal) { diff --git a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx index ae6d0e5c5..40d5fd18d 100644 --- a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx +++ b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx @@ -37,8 +37,7 @@ // Cascade header #include -class SALOMEDS_StudyBuilder_i: public POA_SALOMEDS::StudyBuilder, - public PortableServer::RefCountServantBase +class SALOMEDS_StudyBuilder_i: public POA_SALOMEDS::StudyBuilder { private: CORBA::ORB_ptr _orb; diff --git a/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx b/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx index 31c486f7b..9ef1801bb 100644 --- a/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx +++ b/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx @@ -51,8 +51,8 @@ namespace SALOMEDS{ } -class Standard_EXPORT SALOMEDS_StudyManager_i: public POA_SALOMEDS::StudyManager, - public PortableServer::RefCountServantBase { +class Standard_EXPORT SALOMEDS_StudyManager_i: public POA_SALOMEDS::StudyManager +{ private: CORBA::ORB_ptr _orb; diff --git a/src/SALOMEDS/SALOMEDS_Study_i.hxx b/src/SALOMEDS/SALOMEDS_Study_i.hxx index 6d44afc95..137eca872 100644 --- a/src/SALOMEDS/SALOMEDS_Study_i.hxx +++ b/src/SALOMEDS/SALOMEDS_Study_i.hxx @@ -43,8 +43,7 @@ #include "SALOMEDSImpl_Study.hxx" #include "SALOMEDSImpl_AttributeIOR.hxx" -class Standard_EXPORT SALOMEDS_Study_i: public POA_SALOMEDS::Study, - public PortableServer::RefCountServantBase +class Standard_EXPORT SALOMEDS_Study_i: public POA_SALOMEDS::Study { private: CORBA::ORB_ptr _orb; diff --git a/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.hxx b/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.hxx index c9d039d57..895d1c027 100644 --- a/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.hxx +++ b/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.hxx @@ -41,7 +41,7 @@ #include "SALOMEDSImpl_UseCaseBuilder.hxx" class SALOMEDS_UseCaseBuilder_i: public virtual POA_SALOMEDS::UseCaseBuilder, - public virtual PortableServer::RefCountServantBase, + public virtual PortableServer::ServantBase, public virtual SALOME::GenericObj_i { private: diff --git a/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx b/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx index 0197c77e9..0f4262039 100644 --- a/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx +++ b/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx @@ -35,7 +35,7 @@ #include "SALOMEDSImpl_UseCaseIterator.hxx" class SALOMEDS_UseCaseIterator_i: public virtual POA_SALOMEDS::UseCaseIterator, - public virtual PortableServer::RefCountServantBase, + public virtual PortableServer::ServantBase, public virtual SALOME::GenericObj_i { private: diff --git a/src/SALOMEDS/Test/Makefile.am b/src/SALOMEDS/Test/Makefile.am index be6a60647..7c0008c99 100644 --- a/src/SALOMEDS/Test/Makefile.am +++ b/src/SALOMEDS/Test/Makefile.am @@ -91,18 +91,57 @@ COMMON_LIBS =\ # =============================================================== # lib_LTLIBRARIES = libSALOMEDSTest.la -libSALOMEDSTest_la_SOURCES = SALOMEDSTest.cxx +dist_libSALOMEDSTest_la_SOURCES = SALOMEDSTest.cxx libSALOMEDSTest_la_CPPFLAGS = $(COMMON_CPPFLAGS) libSALOMEDSTest_la_LDFLAGS = -no-undefined -version-info=0:0:0 libSALOMEDSTest_la_LIBADD = $(COMMON_LIBS) +EXTRA_DIST = \ + SALOMEDSTest_AttributeComment.cxx \ + SALOMEDSTest_AttributeDrawable.cxx \ + SALOMEDSTest_AttributeExpandable.cxx \ + SALOMEDSTest_AttributeExternalFileDef.cxx \ + SALOMEDSTest_AttributeFileType.cxx \ + SALOMEDSTest_AttributeFlags.cxx \ + SALOMEDSTest_AttributeGraphic.cxx \ + SALOMEDSTest_AttributeInteger.cxx \ + SALOMEDSTest_AttributeIOR.cxx \ + SALOMEDSTest_AttributeLocalID.cxx \ + SALOMEDSTest_AttributeName.cxx \ + SALOMEDSTest_AttributeOpened.cxx \ + SALOMEDSTest_AttributeParameter.cxx \ + SALOMEDSTest_AttributePersistentRef.cxx \ + SALOMEDSTest_AttributePixMap.cxx \ + SALOMEDSTest_AttributePythonObject.cxx \ + SALOMEDSTest_AttributeReal.cxx \ + SALOMEDSTest_AttributeSelectable.cxx \ + SALOMEDSTest_AttributeSequenceOfInteger.cxx \ + SALOMEDSTest_AttributeSequenceOfReal.cxx \ + SALOMEDSTest_AttributeStudyProperties.cxx \ + SALOMEDSTest_AttributeTableOfInteger.cxx \ + SALOMEDSTest_AttributeTableOfReal.cxx \ + SALOMEDSTest_AttributeTableOfString.cxx \ + SALOMEDSTest_AttributeTarget.cxx \ + SALOMEDSTest_AttributeTextColor.cxx \ + SALOMEDSTest_AttributeTextHighlightColor.cxx\ + SALOMEDSTest_AttributeTreeNode.cxx \ + SALOMEDSTest_AttributeUserID.cxx \ + SALOMEDSTest_ChildIterator.cxx \ + SALOMEDSTest_SComponent.cxx \ + SALOMEDSTest_SComponentIterator.cxx \ + SALOMEDSTest_SObject.cxx \ + SALOMEDSTest_StudyBuilder.cxx \ + SALOMEDSTest_Study.cxx \ + SALOMEDSTest_StudyManager.cxx \ + SALOMEDSTest_UseCase.cxx + # # =============================================================== # Executables targets # =============================================================== # bin_PROGRAMS = TestSALOMEDS -TestSALOMEDS_SOURCES = TestSALOMEDS.cxx +dist_TestSALOMEDS_SOURCES = TestSALOMEDS.cxx TestSALOMEDS_CPPFLAGS = $(COMMON_CPPFLAGS) TestSALOMEDS_LDADD = \ libSALOMEDSTest.la ../libSalomeDS.la \ diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx index f963a80c4..bc23ce57b 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx @@ -476,14 +476,16 @@ Handle(TDF_Attribute) SALOMEDSImpl_StudyBuilder::FindOrCreateAttribute(const Han //The macro adds all necessary checks for standardly behaiving attributes __FindOrCreateAttributeForBuilder - + + //Add checks for TreeNode and UserID attributes if (strncmp(aTypeOfAttribute.ToCString(), "AttributeTreeNode",17) == 0 ) { + Standard_GUID aTreeNodeGUID; if (strcmp(aTypeOfAttribute.ToCString(), "AttributeTreeNode") == 0) { aTreeNodeGUID = SALOMEDSImpl_AttributeTreeNode::GetDefaultTreeID(); } else { - char* aGUIDString = new char[40]; + char* aGUIDString = new char[41]; char* aType = (char*)aTypeOfAttribute.ToCString(); sprintf(aGUIDString, &(aType[17])); if(!Standard_GUID::CheckGUIDFormat(aGUIDString)) { @@ -506,7 +508,7 @@ Handle(TDF_Attribute) SALOMEDSImpl_StudyBuilder::FindOrCreateAttribute(const Han if (strcmp(aTypeOfAttribute.ToCString(), "AttributeUserID") == 0) { aUserGUID = SALOMEDSImpl_AttributeUserID::DefaultID(); } else { - char* aGUIDString = new char[40]; + char* aGUIDString = new char[41]; char* aType = (char*)aTypeOfAttribute.ToCString(); sprintf(aGUIDString, &(aType[15])); if(!Standard_GUID::CheckGUIDFormat(aGUIDString)) { diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx index dd91556cd..17bad0e6a 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx @@ -1170,9 +1170,9 @@ static void ReadAttributes(const Handle(SALOMEDSImpl_Study)& theStudy, Handle(TDF_Attribute) anAttr; - char* current_string = new char[hdf_dataset->GetSize()]; + char* current_string = new char[hdf_dataset->GetSize()+1]; hdf_dataset->ReadFromDisk(current_string); - + if (!strcmp(hdf_dataset->GetName(),"COMPONENTDATATYPE")) { anAttr = theStudy->NewBuilder()->FindOrCreateAttribute(aSO, "AttributeComment"); } else if (!strcmp(hdf_dataset->GetName(),"AttributeReference") || @@ -1184,14 +1184,14 @@ static void ReadAttributes(const Handle(SALOMEDSImpl_Study)& theStudy, } else { anAttr = theStudy->NewBuilder()->FindOrCreateAttribute(aSO, hdf_dataset->GetName()); } - + if (!anAttr.IsNull()) { Handle(SALOMEDSImpl_GenericAttribute) ga = Handle(SALOMEDSImpl_GenericAttribute)::DownCast(anAttr); ga->Load(current_string); //cout << "Reading: " << aSO->GetID() << " "<< ga->Type() << " value: " << current_string << endl; } - + delete(current_string); hdf_dataset->CloseOnDisk(); } -- 2.39.2