summaryrefslogtreecommitdiff
path: root/TAO/tao/CodecFactory/CodecFactory.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/CodecFactory/CodecFactory.h')
-rw-r--r--TAO/tao/CodecFactory/CodecFactory.h17
1 files changed, 7 insertions, 10 deletions
diff --git a/TAO/tao/CodecFactory/CodecFactory.h b/TAO/tao/CodecFactory/CodecFactory.h
index 230914bbbac..82c6f95b05d 100644
--- a/TAO/tao/CodecFactory/CodecFactory.h
+++ b/TAO/tao/CodecFactory/CodecFactory.h
@@ -1,4 +1,5 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
+
//=============================================================================
/**
@@ -16,21 +17,19 @@
#include /**/ "ace/pre.h"
-#include "tao/CodecFactory/codecfactory_export.h"
+#include "codecfactory_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
#define TAO_CODECFACTORY_SAFE_INCLUDE
-#include "tao/CodecFactory/IOP_CodecC.h"
+#include "IOP_CodecC.h"
#undef TAO_CODECFACTORY_SAFE_INCLUDE
#include "tao/Object_Loader.h"
#include "ace/Service_Config.h"
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
class TAO_CodecFactory_Export TAO_CodecFactory_Loader
: public TAO_Object_Loader
{
@@ -46,14 +45,12 @@ public:
static int Initializer (void);
};
-static int
-TAO_Requires_CodecFactory_Initializer = TAO_CodecFactory_Loader::Initializer ();
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
ACE_STATIC_SVC_DECLARE (TAO_CodecFactory_Loader)
ACE_FACTORY_DECLARE (TAO_CodecFactory, TAO_CodecFactory_Loader)
+static int
+TAO_Requires_CodecFactory_Initializer = TAO_CodecFactory_Loader::Initializer ();
+
#include /**/ "ace/post.h"
#endif /* TAO_CODECFACTORY_H */