summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h')
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h17
1 files changed, 7 insertions, 10 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
index e50d6b37867..80493b3838d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
/**
* @file EC_Conjunction_Filter.h
*
@@ -17,15 +16,13 @@
#define TAO_EC_CONJUNCTION_FILTER_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/Event/EC_Filter.h"
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include "EC_Filter.h"
+#include /**/ "event_serv_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
/**
* @class TAO_EC_Conjunction_Filter
*
@@ -79,8 +76,10 @@ private:
/// Determine if all the children have received their events.
int all_received (void) const;
- TAO_EC_Conjunction_Filter (const TAO_EC_Conjunction_Filter&);
- TAO_EC_Conjunction_Filter& operator= (const TAO_EC_Conjunction_Filter&);
+ ACE_UNIMPLEMENTED_FUNC (TAO_EC_Conjunction_Filter
+ (const TAO_EC_Conjunction_Filter&))
+ ACE_UNIMPLEMENTED_FUNC (TAO_EC_Conjunction_Filter& operator=
+ (const TAO_EC_Conjunction_Filter&))
private:
/// The children
@@ -107,7 +106,5 @@ private:
ChildrenIterator current_child_;
};
-TAO_END_VERSIONED_NAMESPACE_DECL
-
#include /**/ "ace/post.h"
#endif /* TAO_EC_CONJUNCTION_FILTER_H */