summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaga <naga@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-14 04:36:53 +0000
committernaga <naga@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-14 04:36:53 +0000
commitc747ee9f10884a00480dfd2be0b6235965b345be (patch)
tree78a6ca8f83b927930d22c705b8e9725c69b5eb9b
parent5a4fff478655145f565a112c453fbf442cffa42e (diff)
downloadATCD-c747ee9f10884a00480dfd2be0b6235965b345be.tar.gz
*** empty log message ***
-rw-r--r--ChangeLog-98b3
-rw-r--r--ace/OS.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b
index 0dcdc85faa2..5b5038e6330 100644
--- a/ChangeLog-98b
+++ b/ChangeLog-98b
@@ -1,5 +1,8 @@
1998-10-13 Nagarajan Surendran <naga@tango.cs.wustl.edu>
+ * ace/Synch.i (ACE_Mutex::remove): Added a #else for non-chorus
+ cases instead of #endif to call ACE_OS::mutex_destroy.
+
* ace/OS.cpp : Added static member definition
KnCap ACE_OS::actorcaps_[ACE_CHORUS_MAX_ACTORS]
for CHORUS.
diff --git a/ace/OS.h b/ace/OS.h
index c10d5f8a35d..066c790c47d 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -5499,7 +5499,7 @@ public:
// structures for TSS keys.
#if defined (CHORUS)
- KnCap actorcaps_[ACE_CHORUS_MAX_ACTORS];
+ static KnCap actorcaps_[ACE_CHORUS_MAX_ACTORS];
// This is used to map an actor's id into a KnCap for killing and
// waiting actors.
#endif /* CHORUS */