diff options
author | Phil Mesnier <mesnier_p@ociweb.com> | 2003-03-21 21:42:02 +0000 |
---|---|---|
committer | Phil Mesnier <mesnier_p@ociweb.com> | 2003-03-21 21:42:02 +0000 |
commit | 41bdf317f293f0d4912623b33228f3f837e1ee89 (patch) | |
tree | efae1890f60980383fda9ff30a42e08e62257ae5 | |
parent | 7d49eb909502b74f92bc96d36badb989dea59cd4 (diff) | |
download | ATCD-41bdf317f293f0d4912623b33228f3f837e1ee89.tar.gz |
ChangeLog tag: Fri Mar 21 15:43:32 2003 Phil Mesnier <mesnier_p@ociweb.com>
-rw-r--r-- | TAO/ChangeLog | 10 | ||||
-rw-r--r-- | TAO/tests/Collocation/Makefile | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 2b453ade9ab..45e118ef0d6 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Fri Mar 21 15:43:32 2003 Phil Mesnier <mesnier_p@ociweb.com> + + * tests/Collocation/Makefile: Add .NOTPARALLEL to the makefile to + prevent the IDL compiler from being run simultaneously and + errantly trashing the DiamondS.cpp file. + Fri Mar 21 15:27:51 2003 Jeff Parsons <j.parsons@vanderbilt.edu> * tao/PortableServer/ImplRepoC.cpp: @@ -69,12 +75,12 @@ Wed Mar 19 18:04:26 2003 Jeff Parsons <j.parsons@vanderbilt.edu> * tao/Any.cpp: - Added no-op specialization for + Added no-op specialization for Any_Dual_Impl_T<CORBA::Exception>::extract(). A working version is not needed, since the spec requires only insertion operators for CORBA::Exception, but the no-op specialization prevents an error in compilers that require explicit template instantiationm, since - the unspecialized version calls the constructor, and + the unspecialized version calls the constructor, and CORBA::Exception is (and is required to be) an abstract class. Wed Mar 19 12:52:22 2003 Ossama Othman <ossama@uci.edu> diff --git a/TAO/tests/Collocation/Makefile b/TAO/tests/Collocation/Makefile index be67640f112..45cb731e00c 100644 --- a/TAO/tests/Collocation/Makefile +++ b/TAO/tests/Collocation/Makefile @@ -1,4 +1,4 @@ -#---------------------------------------------------------------------------- + #---------------------------------------------------------------------------- # # $Id$ # @@ -21,6 +21,8 @@ MKLIST = \ Makefile.impl \ Makefile.test +.NOTPARALLEL: + all debug profile optimize install deinstall clean realclean clobber depend idl_stubs: %.mkfile: % @echo $(MAKE) -f $< $(MKFILE_TARGET) |