diff options
author | bala <balanatarajan@users.noreply.github.com> | 2000-10-31 17:38:07 +0000 |
---|---|---|
committer | bala <balanatarajan@users.noreply.github.com> | 2000-10-31 17:38:07 +0000 |
commit | 4dc95a75ebf63dd9f6977a990a4339accce59978 (patch) | |
tree | d1393236b684747e1a22f46565c334156c0bc4db | |
parent | 454db6cb96f0bb3270c9cfa669544dd93165e3fa (diff) | |
download | ATCD-4dc95a75ebf63dd9f6977a990a4339accce59978.tar.gz |
ChangeLogTag: Tue Oct 31 11:35:31 2000 Balachandran Natarajan <bala@cs.wustl.edu>
-rw-r--r-- | ChangeLog | 15 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-02a | 15 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-03a | 15 | ||||
-rw-r--r-- | ace/Log_Msg.cpp | 13 | ||||
-rw-r--r-- | ace/config-sunos5.5.h | 6 |
5 files changed, 35 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog index 9ae312fc4c3..4237984c2dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,15 +1,20 @@ +Tue Oct 31 11:35:31 2000 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/config-sunos5.5.h: + * ace/Log_Msg.cpp: Added patches provided by Russ. Bugzilla id 710. + Tue Oct 31 08:14:33 2000 Chris Cleeland <cleeland_c@ociweb.com> * wrapper_macros.GNU: - Set defaults for exceptions, rtti, and fast to all be zero (0), - i.e., off. Henceforth, if you're creating a new port and you want - exceptions to be on, you must explicitly have "exceptions=1" in - your platform_*.GNU file. + Set defaults for exceptions, rtti, and fast to all be zero + (0),i.e., off. Henceforth, if you're creating a new port and + you want exceptions to be on, you must explicitly have + "exceptions=1" in your platform_*.GNU file. * platform_irix6.x_common.GNU: - Added an "exceptions=1" directive per the comment above. + Added an "exceptions=1" directive per the comment above. Mon Oct 30 18:56:33 2000 Darrell Brunsch <brunsch@uci.edu> diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 9ae312fc4c3..4237984c2dc 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,15 +1,20 @@ +Tue Oct 31 11:35:31 2000 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/config-sunos5.5.h: + * ace/Log_Msg.cpp: Added patches provided by Russ. Bugzilla id 710. + Tue Oct 31 08:14:33 2000 Chris Cleeland <cleeland_c@ociweb.com> * wrapper_macros.GNU: - Set defaults for exceptions, rtti, and fast to all be zero (0), - i.e., off. Henceforth, if you're creating a new port and you want - exceptions to be on, you must explicitly have "exceptions=1" in - your platform_*.GNU file. + Set defaults for exceptions, rtti, and fast to all be zero + (0),i.e., off. Henceforth, if you're creating a new port and + you want exceptions to be on, you must explicitly have + "exceptions=1" in your platform_*.GNU file. * platform_irix6.x_common.GNU: - Added an "exceptions=1" directive per the comment above. + Added an "exceptions=1" directive per the comment above. Mon Oct 30 18:56:33 2000 Darrell Brunsch <brunsch@uci.edu> diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 9ae312fc4c3..4237984c2dc 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,15 +1,20 @@ +Tue Oct 31 11:35:31 2000 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/config-sunos5.5.h: + * ace/Log_Msg.cpp: Added patches provided by Russ. Bugzilla id 710. + Tue Oct 31 08:14:33 2000 Chris Cleeland <cleeland_c@ociweb.com> * wrapper_macros.GNU: - Set defaults for exceptions, rtti, and fast to all be zero (0), - i.e., off. Henceforth, if you're creating a new port and you want - exceptions to be on, you must explicitly have "exceptions=1" in - your platform_*.GNU file. + Set defaults for exceptions, rtti, and fast to all be zero + (0),i.e., off. Henceforth, if you're creating a new port and + you want exceptions to be on, you must explicitly have + "exceptions=1" in your platform_*.GNU file. * platform_irix6.x_common.GNU: - Added an "exceptions=1" directive per the comment above. + Added an "exceptions=1" directive per the comment above. Mon Oct 30 18:56:33 2000 Darrell Brunsch <brunsch@uci.edu> diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp index 52be31e3688..430864ecc37 100644 --- a/ace/Log_Msg.cpp +++ b/ace/Log_Msg.cpp @@ -9,16 +9,7 @@ #endif /* ACE_NTRACE */ #define ACE_NTRACE 1 -// This must come first to avoid "order of include" problems... - -#if !defined (ACE_HAS_INLINED_OSCALLS) && !defined(ACE_HAS_ONE_DEFINITION_RULE) -# define ACE_HAS_INLINED_OSCALLS -# include "ace/ACE.h" -# undef ACE_HAS_INLINED_OSCALLS -#else -# include "ace/ACE.h" -#endif /* !ACE_HAS_INLINED_OSCALLS */ - +#include "ace/ACE.h" #include "ace/Thread_Manager.h" #include "ace/OS.h" @@ -336,7 +327,7 @@ int ACE_Log_Msg::msg_off_ = 0; // Default per-thread priority mask // By default, no priorities are enabled. -u_long ACE_Log_Msg::default_priority_mask_ = 0; +u_long ACE_Log_Msg::default_priority_mask_ = 0; // Default per-process priority mask // By default, all priorities are enabled. diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h index 0e9c5da4d0f..51f8cf2972f 100644 --- a/ace/config-sunos5.5.h +++ b/ace/config-sunos5.5.h @@ -28,8 +28,8 @@ 2) In TAO, the TAO_Unbounded_Sequence vtbl can't be found. With CC 5.0, those problems may be fixed. And, this is necessary to work around problems with automatic template instantiation. */ -# define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION -# define ACE_TEMPLATES_REQUIRE_SOURCE +//-- Patch by Russ # define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION +//-- Patch bu Russ # define ACE_TEMPLATES_REQUIRE_SOURCE // If -compat=4 is turned on, the old 4.2 settings for iostreams are used, // but the newer, explicit instantiation is used (above) # if (__SUNPRO_CC_COMPAT >= 5) @@ -39,7 +39,7 @@ // ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION... # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# define ACE_USES_OLD_IOSTREAMS +// -- Patch by Russ # define ACE_USES_OLD_IOSTREAMS # define ACE_HAS_THR_C_DEST # endif # if !defined (ACE_HAS_EXCEPTIONS) |