diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-06-30 13:44:33 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-06-30 13:44:33 +0000 |
| commit | 362a6e716d11c0f97200d8fc1856b1270994e585 (patch) | |
| tree | e5914ddbb2cbb4a40b929cf77ffae89ddd0db4f2 /TAO | |
| parent | 61688be54f23e7413d86fd0697f93b14e9b85217 (diff) | |
| download | ATCD-362a6e716d11c0f97200d8fc1856b1270994e585.tar.gz | |
ChangeLogTag: Wed Jun 30 08:37:15 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/CIAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/CIAO/examples/Hello/Receiver/Receiver_exec.cpp | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 3f12d6cb162..f1102023e70 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Wed Jun 30 08:37:15 2004 Jeff Parsons <j.parsons@vanderbilt.edu> + + * examples/Hello/Receiver/Receiver_exec.cpp: + + In Receiver_exec_i::ccm_activate(), changed the construction of + the argv argument passed to ORB_init() to eliminate a const + char* to char* conversion warning. + Tue Jun 29 15:34:00 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * CIDLC/ServantSourceGenerator.cpp: diff --git a/TAO/CIAO/examples/Hello/Receiver/Receiver_exec.cpp b/TAO/CIAO/examples/Hello/Receiver/Receiver_exec.cpp index 2008ef46dc2..1087620ae92 100644 --- a/TAO/CIAO/examples/Hello/Receiver/Receiver_exec.cpp +++ b/TAO/CIAO/examples/Hello/Receiver/Receiver_exec.cpp @@ -82,7 +82,8 @@ Receiver_Impl::Receiver_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL) // initialize and register the corresponding valuefactory in the // component server. Here, we are registering the valuefactory // explicitly to work around this problem. - char *argv[1] = { "Receiver_exec"}; + char *argv[1]; + argv[0] = "Receiver_exec"; int argc = sizeof(argv)/sizeof(argv[0]); CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, |