diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2007-08-02 11:34:39 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2007-08-02 11:34:39 +0000 |
| commit | ec7b894337a12eb3c590e1f02a0b778aa80f56ce (patch) | |
| tree | 814c5fbbb4691c0472265ff252fbaf8e2a7736de | |
| parent | 553735360378d6d3496a92dee4d527013e0a6575 (diff) | |
| download | ATCD-ec7b894337a12eb3c590e1f02a0b778aa80f56ce.tar.gz | |
ChangeLogTag: Thu Aug 2 11:33:16 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 18 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h | 12 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h | 12 |
3 files changed, 38 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 0984cd89a9a..04ec83cf878 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,22 +1,32 @@ +Thu Aug 2 11:33:16 UTC 2007 Chad Elliott <elliott_c@ociweb.com> + + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h: + * orbsvcs/orbsvcs/Notify/RT_Factory.h: + + The Borland compiler does not honor the "using" statement. + Instead of duplicating every create() function in the sub-classes, + I have disabled the 8022 warning for these headers only. The + warning is pushed and popped in each header. + Thu Aug 2 09:45:21 UTC 2007 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/include/ast_component.h: - + Added 'line_number' member to the port description struct. Since ports aren't nodes (which store their line numbers) in the AST, this helps some backends get a total ordering of a component's members. - + * TAO_IDL/fe/y.tab.cpp: * TAO_IDL/fe/idl.yy: - + Added code to set the line number member before the port description struct in enqueued in its component node. Thu Aug 2 09:03:02 UTC 2007 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/include/idl_defines.h: - + Changed the size of the buffer that holds filenames to be processed from 1024 to 2048. A crash was reported and it was determined that there was an attempt to process ~1450 diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h index 76792a03f05..bfb145b966c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h @@ -20,6 +20,14 @@ #include "orbsvcs/Notify/Default_Factory.h" +// The using in the class below is apparently ignored by the +// Borland compiler. Having the using below should take care +// of the warning about hiding virtual functions. +#if defined (__BORLANDC__) +# pragma warning (push) +# pragma warning (disable : 8022) +#endif /* __BORLANDC__ */ + TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** @@ -55,5 +63,9 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL +#if defined (__BORLANDC__) +# pragma warning (pop) +#endif /* __BORLANDC__ */ + #include /**/ "ace/post.h" #endif /* TAO_MC_DEFAULT_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h index 86283b826a4..8bd5d116d7f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h @@ -20,6 +20,14 @@ #include "orbsvcs/Notify/Default_Factory.h" +// The using in the class below is apparently ignored by the +// Borland compiler. Having the using below should take care +// of the warning about hiding virtual functions. +#if defined (__BORLANDC__) +# pragma warning (push) +# pragma warning (disable : 8022) +#endif /* __BORLANDC__ */ + TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** @@ -49,6 +57,10 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL +#if defined (__BORLANDC__) +# pragma warning (pop) +#endif /* __BORLANDC__ */ + ACE_FACTORY_DECLARE (TAO_RT_Notify, TAO_Notify_RT_Factory) #include /**/ "ace/post.h" |