summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/ChangeLog5
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.h3
2 files changed, 7 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index fac271d6541..9e73a051caf 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug 22 14:09:33 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * orbsvcs/tests/EC_Custom_Marshal/ECM_Data.h:
+ Added #include Null_Mutex.h
+
Fri Aug 22 13:59:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/tests/EC_Multiple/EC_Multiple.h:
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.h
index b690100fbce..33218253383 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.h
@@ -13,6 +13,7 @@
#define ECM_DATA_H
#include "ace/Map_Manager.h"
+#include "ace/Null_Mutex.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
@@ -22,12 +23,12 @@
struct ECM_Data
{
- typedef ACE_Map_Manager<CORBA::ULong,CORBA::Double,ACE_Null_Mutex> Inventory;
// Yes, an STL type could be used here and yes, we could write
// generic algorithms for marshalling and demarshalling using
// iterators.
// But ACE (and TAO) must be ported to platforms whose C++ compilers
// will crash and burn when faced with an STL construct.
+ typedef ACE_Map_Manager<CORBA::ULong,CORBA::Double,ACE_Null_Mutex> Inventory;
CORBA::String_var description;
Inventory inventory;