diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-12-24 12:30:14 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-12-24 12:30:14 +0000 |
| commit | c6a222db93ab1ed9e37c8846509fa7f9a4d10b6c (patch) | |
| tree | c0efdd9a3b13918f99bfc678e01984e48647cc76 | |
| parent | aa4d83e82697a6d5daffa21f301fa859c9640e4f (diff) | |
| download | ATCD-c6a222db93ab1ed9e37c8846509fa7f9a4d10b6c.tar.gz | |
ChangeLogTag: Tue Dec 24 07:31:54 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 10 | ||||
| -rw-r--r-- | ace/Argv_Type_Converter.cpp | 4 | ||||
| -rw-r--r-- | ace/Argv_Type_Converter.h | 6 |
4 files changed, 25 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index e3282542e23..76f8a131129 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Tue Dec 24 07:31:54 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * ace/Argv_Type_Converter.h: + * ace/Argv_Type_Converter.cpp: Reverted the following changes "Mon + Dec 23 17:26:42 2002 Steve Huston <shuston@riverace.com>" and + "Mon Dec 23 22:57:18 2002 Balachandran Natarajan + <bala@isis-server.isis.vanderbilt.edu>". The argument parsing in + TAO gets busted due to these changes and most of tests in our + daily builds fail. + Mon Dec 23 22:57:18 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * ace/Argv_Type_Converter.h: Changed saved_argc_ to be of type int diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index e3282542e23..76f8a131129 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,13 @@ +Tue Dec 24 07:31:54 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * ace/Argv_Type_Converter.h: + * ace/Argv_Type_Converter.cpp: Reverted the following changes "Mon + Dec 23 17:26:42 2002 Steve Huston <shuston@riverace.com>" and + "Mon Dec 23 22:57:18 2002 Balachandran Natarajan + <bala@isis-server.isis.vanderbilt.edu>". The argument parsing in + TAO gets busted due to these changes and most of tests in our + daily builds fail. + Mon Dec 23 22:57:18 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * ace/Argv_Type_Converter.h: Changed saved_argc_ to be of type int diff --git a/ace/Argv_Type_Converter.cpp b/ace/Argv_Type_Converter.cpp index 2706bace156..23ea5dd90ef 100644 --- a/ace/Argv_Type_Converter.cpp +++ b/ace/Argv_Type_Converter.cpp @@ -14,7 +14,7 @@ ACE_RCSID (ace, #include "ace/OS_Errno.h" #if defined (ACE_USES_WCHAR) -ACE_Argv_Type_Converter::ACE_Argv_Type_Converter(int argc, wchar_t** argv) +ACE_Argv_Type_Converter::ACE_Argv_Type_Converter(int &argc, wchar_t** argv) : saved_argc_ (argc) , char_argv_ (0) , wchar_argv_ (argv) @@ -34,7 +34,7 @@ ACE_Argv_Type_Converter::ACE_Argv_Type_Converter(int argc, wchar_t** argv) #endif // ACE_USES_WCHAR -ACE_Argv_Type_Converter::ACE_Argv_Type_Converter(int argc, char** argv) +ACE_Argv_Type_Converter::ACE_Argv_Type_Converter(int &argc, char** argv) : saved_argc_(argc) , char_argv_(argv) #if defined (ACE_USES_WCHAR) diff --git a/ace/Argv_Type_Converter.h b/ace/Argv_Type_Converter.h index 0baced068c6..5d662d57733 100644 --- a/ace/Argv_Type_Converter.h +++ b/ace/Argv_Type_Converter.h @@ -39,10 +39,10 @@ class ACE_Export ACE_Argv_Type_Converter { public: - ACE_Argv_Type_Converter (int argc, char** argv); + ACE_Argv_Type_Converter (int &argc, char** argv); #if defined (ACE_USES_WCHAR) - ACE_Argv_Type_Converter (int argc, wchar_t** argv); + ACE_Argv_Type_Converter (int &argc, wchar_t** argv); #endif // ACE_USES_WCHAR ~ACE_Argv_Type_Converter (void); @@ -83,7 +83,7 @@ private: private: /// Original number of input paramter, same as 'argc'. - int saved_argc_; + int &saved_argc_; /// Data member pointer that contains converted argv in ACE_ANTI_TCHAR. char** char_argv_; |