From d78b83f897857f172abc3b7224daac0dee0169b4 Mon Sep 17 00:00:00 2001 From: iliyan Date: Mon, 14 Apr 2008 12:06:17 +0000 Subject: Merged revisions 81337,81342-81344,81351 via svnmerge from https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk/TAO ........ r81337 | iliyan | 2008-04-11 05:51:22 -0500 (Fri, 11 Apr 2008) | 1 line ChangeLogTag: Fri Apr 11 10:50:37 UTC 2008 Iliyan Jeliazkov ........ r81342 | johnnyw | 2008-04-11 14:00:21 -0500 (Fri, 11 Apr 2008) | 1 line ........ r81343 | johnnyw | 2008-04-12 02:53:43 -0500 (Sat, 12 Apr 2008) | 1 line ........ r81344 | johnnyw | 2008-04-12 12:56:11 -0500 (Sat, 12 Apr 2008) | 1 line ........ r81351 | johnnyw | 2008-04-14 05:11:24 -0500 (Mon, 14 Apr 2008) | 1 line ........ --- TAO/ChangeLog | 6 ++++++ TAO/NEWS | 5 +++++ TAO/tao/TAO_Internal.cpp | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d41333a5793..78a0031299e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Fri Apr 11 10:50:37 UTC 2008 Iliyan Jeliazkov + + * tao/TAO_Internal.cpp: + + Adding ACE_TEXT + Thu Apr 10 22:40:22 UTC 2008 Iliyan Jeliazkov * tao/ORB.cpp: diff --git a/TAO/NEWS b/TAO/NEWS index 2903f76b996..18931d3cd48 100644 --- a/TAO/NEWS +++ b/TAO/NEWS @@ -14,6 +14,11 @@ USER VISIBLE CHANGES BETWEEN TAO-1.6.3 and TAO-1.6.4 . Added the ability to remove consumer and supplier proxies and consumer and supplier admins through the Notify Monitor and Control interface. +. Changed Interface Repository's IOR output file from being + world writable to using ACE_DEFAULT_FILE_PERMS. + +. Add support for a location forward with a nil object reference. + USER VISIBLE CHANGES BETWEEN TAO-1.6.2 and TAO-1.6.3 ==================================================== diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index ffe45b8f615..308ddfec94b 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -247,7 +247,8 @@ namespace // Be certain to copy the program name so that service configurator // has something to skip! - ACE_CString argv0 ((argc <= 0 || argv == 0) ? "" : ACE_TEXT_ALWAYS_CHAR (argv[0])); + ACE_CString argv0 ((argc <= 0 || argv == 0) + ? ACE_TEXT ("") : ACE_TEXT_ALWAYS_CHAR (argv[0])); // Construct an argument vector specific to the process-wide // (global) Service Configurator instance. -- cgit v1.2.1