diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2002-07-09 12:21:58 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2002-07-09 12:21:58 +0000 |
| commit | f3778d16b9f9db3ca772a23f59c14f2ab69fca24 (patch) | |
| tree | 257c058e4fec271ee729ede7f138cf348a0197c7 | |
| parent | 764c84e313bfac7fa10a8cf74680fcfd7d759201 (diff) | |
| download | ATCD-f3778d16b9f9db3ca772a23f59c14f2ab69fca24.tar.gz | |
ChangeLogTag: Tue Jul 9 07:21:29 2002 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 14 | ||||
| -rw-r--r-- | ace/Map.cpp | 2 | ||||
| -rw-r--r-- | ace/Map_T.h | 3 | ||||
| -rw-r--r-- | ace/Pair.cpp | 2 | ||||
| -rw-r--r-- | ace/Pair_T.h | 2 | ||||
| -rw-r--r-- | ace/gethrtime.cpp | 2 |
7 files changed, 34 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index fb375ca3b92..c3ca37206d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +Tue Jul 9 07:21:29 2002 Chad Elliott <elliott_c@ociweb.com> + + * ace/Map_T.h: + * ace/Map.cpp: + * ace/Pair_T.h: + * ace/Pair.cpp: + + Remove the use of Map.h and Pair.h. + + * ace/gethrtime.cpp: + + Only compile the contents of this file if using GHS and are + building for the x86. + Mon Jul 8 17:26:51 2002 Steve Huston <shuston@riverace.com> * ace/Task.cpp (svc_run): Borland complains about reinterpret_cast from diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index fb375ca3b92..c3ca37206d7 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,17 @@ +Tue Jul 9 07:21:29 2002 Chad Elliott <elliott_c@ociweb.com> + + * ace/Map_T.h: + * ace/Map.cpp: + * ace/Pair_T.h: + * ace/Pair.cpp: + + Remove the use of Map.h and Pair.h. + + * ace/gethrtime.cpp: + + Only compile the contents of this file if using GHS and are + building for the x86. + Mon Jul 8 17:26:51 2002 Steve Huston <shuston@riverace.com> * ace/Task.cpp (svc_run): Borland complains about reinterpret_cast from diff --git a/ace/Map.cpp b/ace/Map.cpp index daa8b29dc70..1faa6c18f23 100644 --- a/ace/Map.cpp +++ b/ace/Map.cpp @@ -13,7 +13,7 @@ // // ============================================================================ -#include "ace/Map.h" +#include "ace/Map_T.h" ACE_RCSID(ace, Map, "$Id$") diff --git a/ace/Map_T.h b/ace/Map_T.h index 9b4dd6038ad..7730d9686d7 100644 --- a/ace/Map_T.h +++ b/ace/Map_T.h @@ -14,8 +14,7 @@ #define ACE_MAP_T_H #include "ace/pre.h" -#include "ace/Map.h" -#include "ace/Pair.h" +#include "ace/Pair_T.h" #include "ace/Map_Manager.h" #include "ace/Hash_Map_Manager.h" #include "ace/Active_Map_Manager.h" diff --git a/ace/Pair.cpp b/ace/Pair.cpp index 7b595e8b3c7..fce14f96302 100644 --- a/ace/Pair.cpp +++ b/ace/Pair.cpp @@ -13,7 +13,7 @@ // // ============================================================================ -#include "ace/Pair.h" +#include "ace/Pair_T.h" ACE_RCSID(ace, Pair, "$Id$") diff --git a/ace/Pair_T.h b/ace/Pair_T.h index 1e4000789c5..8fb8ac1d5f5 100644 --- a/ace/Pair_T.h +++ b/ace/Pair_T.h @@ -15,7 +15,7 @@ #define ACE_PAIR_T_H #include "ace/pre.h" -#include "ace/Pair.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/gethrtime.cpp b/ace/gethrtime.cpp index 518d5172992..08de489f7f6 100644 --- a/ace/gethrtime.cpp +++ b/ace/gethrtime.cpp @@ -9,6 +9,7 @@ ACE_RCSID(ace, gethrtime, "$Id$") +#if defined (ghs) && (defined (i386) || defined(__i386__)) extern "C" ACE_hrtime_t ACE_gethrtime (void) @@ -56,3 +57,4 @@ ACE_gethrtime (void) # error This file can _only_ be compiled with ACE_HAS_PENTIUM. #endif /* ! ACE_HAS_PENTIUM */ } +#endif /* ghs */ |