summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h')
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h17
1 files changed, 6 insertions, 11 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
index e98f9b28375..e055adfb7eb 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
@@ -1,13 +1,11 @@
-// -*- C++ -*-
-
+// $Id$
+/* -*- C++ -*- */
//=============================================================================
/**
* @file CEC_TypedEventChannel.h
*
* @author Jon Astle (jon@astle45.fsnet.co.uk)
*
- * $Id$
- *
* A new implementation of the COS Typed Event Channel, based on
* the untyped version by Carlos O'Ryan (coryan@cs.wustl.edu)
*
@@ -18,17 +16,17 @@
#define TAO_CEC_TYPEDEVENTCHANNEL_H_
#include /**/ "ace/pre.h"
-#include "orbsvcs/CosEvent/event_serv_export.h"
+#include "event_serv_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
#pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosEvent/CEC_Defaults.h"
+#include "CEC_Defaults.h"
#include "orbsvcs/CosTypedEventChannelAdminS.h"
-#include "orbsvcs/CosEvent/CEC_Factory.h"
+#include "CEC_Factory.h"
#include "tao/IFR_Client/IFR_BasicC.h"
#include "tao/AnyTypeCode/NVList.h"
@@ -37,8 +35,6 @@
#include "ace/Null_Mutex.h"
#include "ace/SString.h"
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
/**
* @class TAO_CEC_TypedEventChannel_Attributes
*
@@ -378,10 +374,9 @@ private:
TAO_CEC_Param * parameters_;
};
-TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_TypedEventChannel.i"
+#include "CEC_TypedEventChannel.i"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"