diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-07-11 11:20:20 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-07-11 11:20:20 +0000 |
| commit | 1857abb6c55218241d6600845540bd08665dafea (patch) | |
| tree | bf64e6d6d287deab951762577a38d0ef8376218c /TAO | |
| parent | f04b476461912e5eebed9f73249ac92b63901c19 (diff) | |
| download | ATCD-1857abb6c55218241d6600845540bd08665dafea.tar.gz | |
ChangeLogTag: Fri Jul 11 11:20:00 UTC 2008 Simon Massey <sma at prismtech dot com>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp | 2 | ||||
| -rw-r--r-- | TAO/utils/catior/catior.cpp | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a32c682636d..999166c4b1b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Fri Jul 11 11:20:00 UTC 2008 Simon Massey <sma at prismtech dot com> + + * tests/ORB_Local_Config/Two_DLL_ORB/server.cpp: + * utils/catior/catior.cpp: + + Missing bracket and missnamed argcw & argvw. + Fri Jul 11 08:00:25 UTC 2008 Vladimir Zykov <vzykov@prismtech.com> * TAO_IDL/include/fe_extern.h: diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp index 11cdd71a3be..dcbd8fbffea 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp @@ -106,7 +106,7 @@ Server_Worker::test_main (int argc, ACE_TCHAR *argv[]) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) Cannot open output file %s for writing IOR: %s"), ior_file_.c_str (), - ACE_TEXT_CHAR_TO_TCHAR (ior.in ()), + ACE_TEXT_CHAR_TO_TCHAR (ior.in ())), 1); ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp index 4c5e6adb765..6718ac70865 100644 --- a/TAO/utils/catior/catior.cpp +++ b/TAO/utils/catior/catior.cpp @@ -459,12 +459,12 @@ catpoop (char* string) int ACE_TMAIN (int argcw, ACE_TCHAR *argvw[]) { - CORBA::ORB_var orb_var = CORBA::ORB_init (argc, argv, "TAO"); + CORBA::ORB_var orb_var = CORBA::ORB_init (argcw, argvw, "TAO"); CORBA::Boolean b = 0; CORBA::Boolean have_argument = 0; int opt; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("f:n:x")); + ACE_Get_Opt get_opt (argcw, argvw, ACE_TEXT ("f:n:x")); while ((opt = get_opt ()) != EOF) { |