summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h')
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h21
1 files changed, 13 insertions, 8 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
index 06a6549aff3..f9067132c3b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
//=============================================================================
/**
@@ -27,8 +27,11 @@
#include "orbsvcs/ETCL/ETCL_Constraint_Visitor.h"
#include "orbsvcs/DsLogAdminC.h"
+#include "ace/Null_Mutex.h"
-#include "log_serv_export.h"
+#include "orbsvcs/Log/log_serv_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
class TAO_ETCL_Constraint;
class TAO_ETCL_Literal_Constraint;
@@ -45,7 +48,7 @@ class TAO_Log_Serv_Export TAO_Log_Constraint_Visitor :
public:
/// Constructor.
- TAO_Log_Constraint_Visitor (DsLogAdmin::LogRecord &rec);
+ TAO_Log_Constraint_Visitor (const DsLogAdmin::LogRecord &rec);
/**
* Returns 1 if the offer satisfies the constraint
@@ -100,10 +103,13 @@ private:
CORBA::TCKind tc_kind);
private:
+ /// Size of property_lookup_ hash map.
+ /// TODO: define inline once VC6 support is deprecated.
+ static const size_t property_lookup_size_;
typedef ACE_Hash_Map_Manager <ACE_CString,
- CORBA::Any_var,
- TAO_SYNCH_MUTEX> HASH_MAP;
+ CORBA::Any,
+ ACE_Null_Mutex> HASH_MAP;
typedef HASH_MAP::ENTRY HASH_ENTRY;
@@ -116,10 +122,9 @@ private:
/// Holder for a value found in property_lookup_ or for a
/// nested type within that value.
CORBA::Any_var current_member_;
-
- /// Local LogRecord.
- DsLogAdmin::LogRecord &rec_;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_LOG_CONSTRAINT_VISITORS_H */