diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-09-29 07:27:17 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-09-29 07:27:17 +0000 |
| commit | 7a6b81124b540a47847b5e8faaad7f3c24b9d686 (patch) | |
| tree | f2581f7b84a2adef03c55718e935c23a2741819b /TAO/tao/diffs | |
| parent | 50ab13ba0d651c1e78acae774567beaa5e0d0d4d (diff) | |
| download | ATCD-7a6b81124b540a47847b5e8faaad7f3c24b9d686.tar.gz | |
ChangeLogTag: Fri Sep 29 02:09:32 2000 Irfan Pyarali <irfan@cs.wustl.edu>
Diffstat (limited to 'TAO/tao/diffs')
| -rw-r--r-- | TAO/tao/diffs/RTPortableServerC.cpp.diff | 16 | ||||
| -rw-r--r-- | TAO/tao/diffs/RTPortableServerC.h.diff | 39 |
2 files changed, 55 insertions, 0 deletions
diff --git a/TAO/tao/diffs/RTPortableServerC.cpp.diff b/TAO/tao/diffs/RTPortableServerC.cpp.diff new file mode 100644 index 00000000000..4d78209a4a8 --- /dev/null +++ b/TAO/tao/diffs/RTPortableServerC.cpp.diff @@ -0,0 +1,16 @@ +--- RTPortableServerC.cpp Fri Sep 29 01:51:22 2000 ++++ ..\RTPortableServerC.cpp Fri Sep 29 02:04:44 2000 +@@ -21,6 +21,8 @@ + + #include "RTPortableServerC.h" + ++#if (TAO_HAS_RT_CORBA == 1) ++ + #if !defined (__ACE_INLINE__) + #include "RTPortableServerC.i" + #endif /* !defined INLINE */ +@@ -112,3 +114,4 @@ + # pragma instantiate TAO_Object_Manager<RTPortableServer::POA,RTPortableServer::POA_var> + #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + ++#endif /* TAO_HAS_RT_CORBA == 1 */ diff --git a/TAO/tao/diffs/RTPortableServerC.h.diff b/TAO/tao/diffs/RTPortableServerC.h.diff new file mode 100644 index 00000000000..648465dd84b --- /dev/null +++ b/TAO/tao/diffs/RTPortableServerC.h.diff @@ -0,0 +1,39 @@ +--- RTPortableServerC.h Fri Sep 29 01:51:22 2000 ++++ ..\RTPortableServerC.h Fri Sep 29 02:04:44 2000 +@@ -23,14 +23,15 @@ + #define _TAO_IDL_RTPORTABLESERVERC_H_ + + #include "ace/pre.h" +-#include "tao/corba.h" ++#include "PortableServerC.h" ++ ++#if (TAO_HAS_RT_CORBA == 1) + + #if !defined (ACE_LACKS_PRAGMA_ONCE) + # pragma once + #endif /* ACE_LACKS_PRAGMA_ONCE */ + +-#include "PortableServerC.h" +-#include "RTCORBAC.h" ++#include "tao/RTCORBAC.h" + + #if defined (TAO_EXPORT_MACRO) + #undef TAO_EXPORT_MACRO +@@ -125,7 +126,7 @@ + #if !defined (_RTPORTABLESERVER_POA_CH_) + #define _RTPORTABLESERVER_POA_CH_ + +-class TAO_PortableServer_Export POA: public virtual PortableServer::POA ++class TAO_PortableServer_Export POA: public PortableServer::POA + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) +@@ -232,6 +233,8 @@ + #if defined(_MSC_VER) && (_MSC_VER >= 1200) + #pragma warning(pop) + #endif /* _MSC_VER */ ++ ++#endif /* TAO_HAS_RT_CORBA */ + + #include "ace/post.h" + #endif /* ifndef */ |