11#include " Echo_i.h"
22
3- enum { BIG_LENGTH = 4 * 1024 } ;
3+ constexpr size_t BIG_LENGTH = 4 * 1024 ;
44
55// Constructor.
66
@@ -9,37 +9,29 @@ Echo_i::Echo_i (CORBA::ORB_ptr o)
99{
1010}
1111
12- // Destructor.
13-
14- Echo_i::~Echo_i ()
15- {
16- }
17-
1812// Return a list of strings.
19-
2013Echo::List *
2114Echo_i::return_list ()
2215{
2316 Echo::List_var list;
2417
2518 {
26- Echo::List *tmp = 0 ;
19+ Echo::List *tmp {} ;
2720 ACE_NEW_RETURN (tmp,
2821 Echo::List (2 ),
29- 0 );
22+ {} );
3023 list = tmp;
3124 }
3225
3326 list->length (2 );
3427
3528 // Just do something to get a 'big' list of strings.
3629 CORBA ::Char big[BIG_LENGTH + 1 ];
37- for (int i = 0 ; i < BIG_LENGTH ; ++i)
30+ for (size_t i = 0 ; i < BIG_LENGTH ; ++i)
3831 big[i] = ' A' ;
3932 big[BIG_LENGTH ] = 0 ;
40- CORBA ::Char small[] = " Hello World" ;
4133 list[CORBA::ULong (0 )] = CORBA::string_dup (big);
42- list[CORBA::ULong (1 )] = CORBA::string_dup (small );
34+ list[CORBA::ULong (1 )] = CORBA::string_dup (" Hello World " );
4335
4436 return list._retn ();
4537}
@@ -50,22 +42,22 @@ Echo_i::return_wlist ()
5042 Echo::WList_var list;
5143
5244 {
53- Echo::WList *tmp = 0 ;
45+ Echo::WList *tmp {} ;
5446 ACE_NEW_RETURN (tmp,
5547 Echo::WList (2 ),
56- 0 );
48+ {} );
5749 list = tmp;
5850 }
5951
6052 list->length (2 );
6153
6254 // Just do something to get a 'big' list of wide strings.
6355 CORBA ::WChar big[BIG_LENGTH + 1 ];
64- for (int i = 0 ; i < BIG_LENGTH ; ++i)
56+ for (size_t i = 0 ; i < BIG_LENGTH ; ++i)
6557 big[i] = ' A' ;
6658 big[BIG_LENGTH ] = 0 ;
6759 CORBA ::WChar small[17 + 1 ];
68- for (int i = 0 ; i < 17 ; ++i)
60+ for (size_t i = 0 ; i < 17 ; ++i)
6961 small[i] = ' B' ;
7062 small[17 ] = 0 ;
7163 list[CORBA::ULong (0 )] = CORBA::wstring_dup (big);
@@ -77,7 +69,7 @@ Echo_i::return_wlist ()
7769// Shutdown the server application.
7870
7971void
80- Echo_i::shutdown (void )
72+ Echo_i::shutdown ()
8173{
8274 ACE_DEBUG ((LM_DEBUG ,
8375 ACE_TEXT (" \n The echo server is shutting down\n " )));
0 commit comments