diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-12-21 14:42:35 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-12-21 14:42:35 +0000 |
| commit | 0ea8fe8dbfeab734f7e1b16b31263d5227d00043 (patch) | |
| tree | 93586f3b32b5400b25c521dce6fcbae8d827a734 | |
| parent | de697d0524d4ceaac74939c24c0d04988460e673 (diff) | |
| download | ATCD-0ea8fe8dbfeab734f7e1b16b31263d5227d00043.tar.gz | |
ChangeLogTag: Tue Dec 21 08:34:03 1999 David L. Levine <levine@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-99c | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.cpp | 8 |
3 files changed, 18 insertions, 4 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 658562d3ebe..0a7b63739a1 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,12 @@ +Tue Dec 21 08:34:03 1999 David L. Levine <levine@cs.wustl.edu> + + * orbsvcs/orbsvcs/Makefile (TAO_ORBSVCS_SRCS): removed + ID_Pool_T because it doesn't need to be compiled. + ID_Pool_T.cpp only contains template class member functions. + + * orbsvcs/orbsvcs/Notify/ID_Pool_T.cpp: added protection + against multiple inclusion. + Mon Dec 20 21:14:17 1999 David L. Levine <levine@cs.wustl.edu> * orbsvcs/Makefile (DIRS): added Notify_Service. diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile index d10a329b60c..a8f6807c214 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile +++ b/TAO/orbsvcs/orbsvcs/Makefile @@ -45,7 +45,7 @@ ifndef minimum_corba # Trader uses DynAny which is disabled when compiling with minimum # CORBA support. LifeCycle depend on Trader so don't build # them either. - TAO_ORBSVCS += Trader LifeCycle Log + TAO_ORBSVCS += Trader LifeCycle Log endif # minimum_corba @@ -303,8 +303,7 @@ ifneq (,$(findstring Notify,$(TAO_ORBSVCS))) Notify/Notify_StructuredProxyPushSupplier_i \ Notify/Notify_StructuredProxyPushConsumer_i \ Notify/Notify_StructuredPushConsumer \ - Notify/Notify_StructuredPushSupplier \ - Notify/ID_Pool_T + Notify/Notify_StructuredPushSupplier #If the Trader is not being build, include the files that we need. ifeq (,$(findstring Trader,$(TAO_ORBSVCS))) diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.cpp index 277ba37968b..f2ccb77dfd9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.cpp @@ -1,4 +1,8 @@ -//$Id$ +// $Id$ + +#ifndef ID_POOL_T_C +#define ID_POOL_T_C + #include "ID_Pool_T.h" #if !defined (__ACE_INLINE__) @@ -16,3 +20,5 @@ ID_Pool<ID_TYPE>::get (void) { return ++id_; } + +#endif /* ID_POOL_T_C */ |