summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-09-10 01:03:32 +0000
committerjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-09-10 01:03:32 +0000
commit133c2be2bfd654a79c046c2170c33f48c9e9d1d3 (patch)
treecc7e5c837df8ef835acbcec85cfc6b0a86ffe4b2 /TAO
parent994753c7549532588ea1eb5ee2ad36094c02e8e3 (diff)
downloadATCD-133c2be2bfd654a79c046c2170c33f48c9e9d1d3.tar.gz
ChangeLogTag: Thu Sep 9 17:24:29 2004 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO')
-rw-r--r--TAO/ChangeLog10
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h4
2 files changed, 12 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 626faa08912..8c755b28576 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Thu Sep 9 17:24:29 2004 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * orbsvcs/orbsvcs/Notify/Notify_Extensions.h:
+
+ Revert change:
+ Wed Sep 8 12:15:18 2004 J.T. Conklin <jtc@acorntoolworks.com>
+
+ for this file only. This is actually part of the notication
+ client stub library.
+
Thu Sep 9 16:16:48 2004 Ossama Othman <ossama@dre.vanderbilt.edu>
* tao/ORB.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h
index 22eaff5e452..f79ffa1a0fe 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h
@@ -6,7 +6,7 @@
#include /**/ "ace/pre.h"
-#include "notify_serv_export.h"
+#include "notify_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
@@ -17,7 +17,7 @@
#if defined (TAO_EXPORT_MACRO)
# undef TAO_EXPORT_MACRO
#endif /* TAO_EXPORT_MACRO */
-#define TAO_EXPORT_MACRO TAO_Notify_Serv_Export
+#define TAO_EXPORT_MACRO TAO_Notify_Export
namespace TAO_Notify_Extensions
{