From c303f878e5cd014d9b555573d77df6e66cbbce9d Mon Sep 17 00:00:00 2001 From: kitty Date: Sun, 20 Oct 2002 03:02:07 +0000 Subject: ChangeLogTag: Sat Oct 19 21:58:00 2002 Krishnakumar B --- ChangeLog | 18 ++++++++++++++++++ ChangeLogs/ChangeLog-03a | 18 ++++++++++++++++++ ace/Argv_Type_Converter.cpp | 16 ++++++++-------- ace/Argv_Type_Converter.h | 6 +++--- ace/Argv_Type_Converter.inl | 2 +- ace/Codecs.cpp | 4 ++-- ace/Codecs.h | 2 +- ace/OS.cpp | 4 ++-- ace/SString.cpp | 5 +---- ace/Vector_T.cpp | 7 +++---- ace/Vector_T.h | 12 ++++++------ ace/WFMO_Reactor.cpp | 2 +- tests/Makefile | 9 +++++---- tests/Proactor_Scatter_Gather_Test.cpp | 16 +++++++++------- 14 files changed, 78 insertions(+), 43 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5c68e98dda..02ec85ca4d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +Sat Oct 19 21:58:00 2002 Krishnakumar B + + * ace/Argv_Type_Converter.cpp: + * ace/Argv_Type_Converter.h: + * ace/Argv_Type_Converter.inl: + * ace/Codecs.cpp: + * ace/Codecs.h: + * ace/OS.cpp: + * ace/Vector_T.cpp: + * ace/Vector_T.h: + * ace/WFMO_Reactor.cpp: + * tests/Proactor_Scatter_Gather_Test.cpp: Convert bool to use int. + + * ace/SString.cpp: Removed a redundant initialization to 0. + + * tests/Makefile: Add DIRS_PARALLEL=1 to allow building in + parallel in $ACE_ROOT/tests. + Sat Oct 19 11:40:22 2002 Steve Huston * ace/OS.h: Added a ptrdiff_t typedef for ACE_HAS_WINCE. eVC3, diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index c5c68e98dda..02ec85ca4d9 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,21 @@ +Sat Oct 19 21:58:00 2002 Krishnakumar B + + * ace/Argv_Type_Converter.cpp: + * ace/Argv_Type_Converter.h: + * ace/Argv_Type_Converter.inl: + * ace/Codecs.cpp: + * ace/Codecs.h: + * ace/OS.cpp: + * ace/Vector_T.cpp: + * ace/Vector_T.h: + * ace/WFMO_Reactor.cpp: + * tests/Proactor_Scatter_Gather_Test.cpp: Convert bool to use int. + + * ace/SString.cpp: Removed a redundant initialization to 0. + + * tests/Makefile: Add DIRS_PARALLEL=1 to allow building in + parallel in $ACE_ROOT/tests. + Sat Oct 19 11:40:22 2002 Steve Huston * ace/OS.h: Added a ptrdiff_t typedef for ACE_HAS_WINCE. eVC3, diff --git a/ace/Argv_Type_Converter.cpp b/ace/Argv_Type_Converter.cpp index 20b43f5b9e6..83b1da2602d 100644 --- a/ace/Argv_Type_Converter.cpp +++ b/ace/Argv_Type_Converter.cpp @@ -17,9 +17,9 @@ ACE_Argv_Type_Converter::ACE_Argv_Type_Converter(int& argc, wchar_t** argv) , char_argv_ (0) , wchar_argv_ (argv) , before_pass_argc_ (argc) - , original_type_ (true) - , wchar_passed_ (false) - , char_passed_ (false) + , original_type_ (1) + , wchar_passed_ (0) + , char_passed_ (0) { this->initialize (); @@ -38,9 +38,9 @@ ACE_Argv_Type_Converter::ACE_Argv_Type_Converter(int& argc, char** argv) #if defined (ACE_USES_WCHAR) , wchar_argv_(0) , before_pass_argc_(argc) - , original_type_(false) - , wchar_passed_(false) - , char_passed_(false) + , original_type_(0) + , wchar_passed_(0) + , char_passed_(0) { this->initialize(); @@ -192,7 +192,7 @@ ACE_Argv_Type_Converter::cleanup (void) this->before_pass_argc_ = this->saved_argc_; - this->wchar_passed_ = false; - this->char_passed_ = false; + this->wchar_passed_ = 0; + this->char_passed_ = 0; } #endif // ACE_USES_WCHAR diff --git a/ace/Argv_Type_Converter.h b/ace/Argv_Type_Converter.h index e606593e8bc..23817a6448c 100644 --- a/ace/Argv_Type_Converter.h +++ b/ace/Argv_Type_Converter.h @@ -97,13 +97,13 @@ private: /// FALSE represents original argv passed in is char, and TRUE /// represents wchar_t. - const bool original_type_; + const int original_type_; /// TRUE indicates wchar_t type argv has been passed. - bool wchar_passed_; + int wchar_passed_; /// TRUE indicates char type argv has been passed. - bool char_passed_; + int char_passed_; #endif /* ACE_USES_WCHAR */ }; diff --git a/ace/Argv_Type_Converter.inl b/ace/Argv_Type_Converter.inl index dbba9309f8e..16c657ce864 100644 --- a/ace/Argv_Type_Converter.inl +++ b/ace/Argv_Type_Converter.inl @@ -28,7 +28,7 @@ ACE_Argv_Type_Converter::get_ASCII_argv (void) this->align_char_with_wchar (); } - this->char_passed_ = true; + this->char_passed_ = 1; #endif // ACE_USES_WCHAR return this->char_argv_; diff --git a/ace/Codecs.cpp b/ace/Codecs.cpp index bbfc8fa4d8d..39457567769 100644 --- a/ace/Codecs.cpp +++ b/ace/Codecs.cpp @@ -8,7 +8,7 @@ const ACE_Byte ACE_Base64::alphabet_[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijkl const ACE_Byte ACE_Base64::pad_ = '='; -bool ACE_Base64::init_ = false; +int ACE_Base64::init_ = 0; int ACE_Base64::max_columns_ = 72; @@ -206,7 +206,7 @@ ACE_Base64::init () ACE_Base64::decoder_[ACE_Base64::alphabet_[i]] = i; ACE_Base64::member_[ACE_Base64::alphabet_[i]] = 1; } - ACE_Base64::init_ = true; + ACE_Base64::init_ = 1; } return; } diff --git a/ace/Codecs.h b/ace/Codecs.h index d6b05a2fc6b..7e25cee826e 100644 --- a/ace/Codecs.h +++ b/ace/Codecs.h @@ -99,7 +99,7 @@ private: static const ACE_Byte pad_; /// Boolean to denote whether initialization is complete - static bool init_; + static int init_; /// Number of columns per line of encoded output (Can have a max value of 76) static int max_columns_; diff --git a/ace/OS.cpp b/ace/OS.cpp index 647244cd7b5..31885a4d150 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -6835,7 +6835,7 @@ ACE_CE_ARGV::ACE_CE_ARGV(ACE_TCHAR* cmdLine) int formattedCmdLength = ACE_OS::strlen(formattedCmdLine); - bool insideQuotation = false; + int insideQuotation = 0; int* argv_strlen = 0; int entry_size = 0; ACE_NEW (argv_strlen, int[max_possible_argc]); @@ -6850,7 +6850,7 @@ ACE_CE_ARGV::ACE_CE_ARGV(ACE_TCHAR* cmdLine) } else if (formattedCmdLine[i] == '"') { - insideQuotation = !insideQuotation; + insideQuotation = (insideQuotation ? 0 : 1); } else if ((!insideQuotation) && (iswspace(formattedCmdLine[i]) != 0)) { diff --git a/ace/SString.cpp b/ace/SString.cpp index 33899b0eac2..c8f8ba61ffd 100644 --- a/ace/SString.cpp +++ b/ace/SString.cpp @@ -324,11 +324,8 @@ ACE_NS_WString::ACE_NS_WString (const char *s, this->allocator_->malloc ((this->buf_len_ + 1) * sizeof (ACE_WSTRING_TYPE))); this->release_ = 1; - size_t i; - for (i = 0; i < this->buf_len_; i++) + for (size_t i = 0; i <= this->buf_len_; i++) this->rep_[i] = s[i]; - this->rep_[i] = 0; - } #if defined (ACE_WSTRING_HAS_USHORT_SUPPORT) diff --git a/ace/Vector_T.cpp b/ace/Vector_T.cpp index b646f204bec..d6f997a966c 100644 --- a/ace/Vector_T.cpp +++ b/ace/Vector_T.cpp @@ -47,7 +47,7 @@ void ACE_Vector::dump (void) const { #if 0 // Can't do this unless the vector is an object with a dump - // function. + // function. for (size_t i = 0; i < this->size (); ++i) (*this)[i].dump (); #endif /* 0 */ @@ -55,7 +55,7 @@ void ACE_Vector::dump (void) const #if 0 template -bool compare(const ACE_Vector& v1, +int compare(const ACE_Vector& v1, const ACE_Vector& v2, const size_t from_ndx, const size_t to_ndx) @@ -91,7 +91,7 @@ bool compare(const ACE_Vector& v1, } template -bool partial_compare(const ACE_Vector& v1, +int partial_compare(const ACE_Vector& v1, const ACE_Vector& v2, const size_t from_ndx, const size_t to_ndx) @@ -123,4 +123,3 @@ bool partial_compare(const ACE_Vector& v1, #endif #endif /* ACE_VECTOR_T_C */ - diff --git a/ace/Vector_T.h b/ace/Vector_T.h index 3157f8c42f5..0e06a11f486 100644 --- a/ace/Vector_T.h +++ b/ace/Vector_T.h @@ -25,7 +25,7 @@ /* * Default size for an ACE_Vector. */ -const size_t ACE_VECTOR_DEFAULT_SIZE = 32; +const size_t ACE_VECTOR_DEFAULT_SIZE = 32; /** * @class ACE_Vector @@ -146,7 +146,7 @@ public: * performance. */ void pop_back (void); - + /** * This function dumps the content of the vector. TO BE MOVED out * of this class. It needs to be implemented as a global template @@ -198,8 +198,8 @@ protected: * returns false otherwise. Also, returns false in case if * v1's size is not equal to v2's size. */ -template -bool compare (const ACE_Vector& v1, +template +int compare (const ACE_Vector& v1, const ACE_Vector& v2, const size_t from_ndx, const size_t to_ndx); @@ -220,8 +220,8 @@ bool compare (const ACE_Vector& v1, * index range. */ -template -bool partial_compare (const ACE_Vector& v1, +template +int partial_compare (const ACE_Vector& v1, const ACE_Vector& v2, const size_t from_ndx, const size_t to_ndx); diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp index 2fcb87de32d..3f55ad7a693 100644 --- a/ace/WFMO_Reactor.cpp +++ b/ace/WFMO_Reactor.cpp @@ -1815,7 +1815,7 @@ ACE_WFMO_Reactor::dispatch_handles (DWORD wait_status) ; number_of_handlers_dispatched++) { - bool ok = ( + int ok = ( #if ! (defined(__BORLANDC__) && (__BORLANDC__ >= 0x0530)) \ && !defined (ghs) \ && !defined (__MINGW32__) diff --git a/tests/Makefile b/tests/Makefile index 402d0d4697b..149533febe6 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -8,6 +8,7 @@ #---------------------------------------------------------------------------- # Local macros #---------------------------------------------------------------------------- +DIRS_PARALLEL = 1 BIN = Aio_Platform_Test \ Arg_Shifter_Test \ @@ -168,7 +169,7 @@ else endif ifeq ($(shared_libs),1) -# Both the Service_Config_Test and Framework_Component_Test dynamically load +# Both the Service_Config_Test and Framework_Component_Test dynamically load # a shared library. BIN += Service_Config_Test BIN += Framework_Component_Test @@ -197,9 +198,9 @@ ifndef SOEXT endif ifdef shared_libs ifndef VXWORKS - #### Build libFramework_Component_DLL, libDLL_Test, and - #### libService_Config_DLL libraries first, so that they - #### don't see the template instantiations from all of the + #### Build libFramework_Component_DLL, libDLL_Test, and + #### libService_Config_DLL libraries first, so that they + #### don't see the template instantiations from all of the #### tests. BUILD := \ libFramework_Component_DLL.$(SOEXT) \ diff --git a/tests/Proactor_Scatter_Gather_Test.cpp b/tests/Proactor_Scatter_Gather_Test.cpp index adfce4bca6f..41710cb3423 100644 --- a/tests/Proactor_Scatter_Gather_Test.cpp +++ b/tests/Proactor_Scatter_Gather_Test.cpp @@ -55,8 +55,8 @@ static ACE_TCHAR *input_file = ACE_TEXT("Proactor_Scatter_Gather_Test.cpp"); // Name of the output file. static ACE_TCHAR *output_file = ACE_TEXT("output"); -static bool client_only = false; -static bool server_only = false; +static int client_only = 0; +static int server_only = 0; static size_t chunk_size = 0; enum @@ -504,7 +504,9 @@ Receiver::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result) // write everything or only complete chunks? // write everything - when no new bytes were transferred - bool write_everything = !result.bytes_transferred (); + int write_everything = 0; + if (!result.bytes_transferred ()) + write_everything = 1; if (write_everything) Receiver::writer_->handle_read_chunks_chain (mb, this->odd_ ? ODD : EVEN); @@ -1306,12 +1308,12 @@ parse_args (int argc, ACE_TCHAR *argv[]) input_file = get_opt.opt_arg (); break; case 'c': - client_only = true; - server_only = false; + client_only = 1; + server_only = 0; break; case 's': - server_only = true; - client_only = false; + server_only = 1; + client_only = 0; break; case 'h': host = get_opt.opt_arg (); -- cgit v1.2.1