diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-09-12 17:43:48 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-09-12 17:43:48 +0000 |
| commit | 10ec8bf8b3dda3bf531139b2f5fa391e7b2a9a30 (patch) | |
| tree | 1ff58c98017d645b93923264afc55bb4aa385fa9 | |
| parent | 1c1928c690f08bf697079ac7d6f4f3ea1b42a716 (diff) | |
| download | ATCD-10ec8bf8b3dda3bf531139b2f5fa391e7b2a9a30.tar.gz | |
ChangeLogTag:Fri Sep 12 10:42:30 2003 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h | 22 |
2 files changed, 22 insertions, 9 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 1b21493df14..557a36e6413 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Fri Sep 12 10:42:30 2003 Ossama Othman <ossama@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h: + + Moved typedefs within the preprocessor block that is enabled + when ACE_ENABLE_TIMEPROBES and ACE_COMPILE_TIMEPROBES are + defined. Fixes compile-time errors on builds that do not enable + timeprobe support. + Fri Sep 12 10:29:13 MST 2003 Trevor Fields <fields_t@ociweb.com> * tests/Portable_Interceptors/Bug_1559/interceptors.cpp: diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h index 62ed8d9e10c..df418913117 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h @@ -1,10 +1,13 @@ +// -*- C++ -*- +// // $Id$ #ifndef METRICS_LOCAL_CACHE_H #define METRICS_LOCAL_CACHE_H +#include /**/ "ace/pre.h" -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,9 +26,9 @@ #include "Metrics_Utils.h" -#if defined (__ACE_INLINE__) -#include "Metrics_LocalCache.i" -#endif /* __ACE_INLINE__ */ +#if defined (ACE_METRICS_COLLECTION) + +#if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES) #include "Metrics_LocalCache_T.h" @@ -49,11 +52,6 @@ typedef TAO_METRICS_CACHE_TYPE TAO_METRICS_CACHE; typedef TAO_METRICS_CACHE_SINGLETON_TYPE TAO_METRICS_CACHE_SINGLETON; #endif - -#if defined (ACE_METRICS_COLLECTION) - -#if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES) - /** * NOTE: This is a simple macro which calls the appropriate registration function with the cache to * store the data from this pointer. At the ACE level there is no need to give a PROBE_TYPE @@ -99,8 +97,14 @@ PROBE_TYPE, \ METRICS_LOGGER_REF); \ } } while (0) +#if defined (__ACE_INLINE__) +#include "Metrics_LocalCache.i" +#endif /* __ACE_INLINE__ */ + #endif /* ACE_ENABLE_TIMEPROBES && ACE_COMPILE_TIMEPROBES */ #endif /* ACE_METRICS_COLLECTION */ +#include /**/ "ace/post.h" + #endif /* METRICS_LOCAL_CACHE_H */ |