From ec6f37e15143bd99f636757e86720cd1504552f7 Mon Sep 17 00:00:00 2001
From: sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>
Date: Wed, 22 Oct 2008 15:24:03 +0000
Subject: ChangeLogTag: Wed Oct 22 15:25:00 UTC 2008  Simon Massey  <sma at
 prismtech dot com>

---
 TAO/DevGuideExamples/ChangeLog                     |  8 +++++++
 .../NotifyService/Messenger/Messenger.mpc          | 25 ----------------------
 .../Messenger/NotifyServiceMessenger.mpc           | 25 ++++++++++++++++++++++
 3 files changed, 33 insertions(+), 25 deletions(-)
 delete mode 100644 TAO/DevGuideExamples/NotifyService/Messenger/Messenger.mpc
 create mode 100644 TAO/DevGuideExamples/NotifyService/Messenger/NotifyServiceMessenger.mpc

(limited to 'TAO/DevGuideExamples')

diff --git a/TAO/DevGuideExamples/ChangeLog b/TAO/DevGuideExamples/ChangeLog
index ccc1d05668b..e5321de638e 100644
--- a/TAO/DevGuideExamples/ChangeLog
+++ b/TAO/DevGuideExamples/ChangeLog
@@ -1,3 +1,11 @@
+Wed Oct 22 15:25:00 UTC 2008  Simon Massey  <sma at prismtech dot com>
+
+        * NotifyService/Messenger/Messenger.mpc:
+
+          Renamed to avoid name clash.
+
+        * NotifyService/Messenger/NotifyService_Messenger.mpc:
+
 Wed Oct 22 15:05:00 UTC 2008  Simon Massey  <sma at prismtech dot com>
 
         * Multithreading/ThreadPerConnection/ThreadPerConnection.mpc:
diff --git a/TAO/DevGuideExamples/NotifyService/Messenger/Messenger.mpc b/TAO/DevGuideExamples/NotifyService/Messenger/Messenger.mpc
deleted file mode 100644
index c6cd2f3d24c..00000000000
--- a/TAO/DevGuideExamples/NotifyService/Messenger/Messenger.mpc
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-project(*Server): taoexe, portableserver, namingexe, notification_skel {
-  Source_Files {
-    StructuredEventSupplier_i.cpp
-    MessengerServer.cpp         
-    Messenger_i.cpp
-  }
-}
-
-project(*Client): taoexe, namingexe, notification {
-  Source_Files {
-    MessengerC.cpp
-    MessengerClient.cpp
-  }
-}
-
-project(*Consumer): taoexe, portableserver, namingexe, notification_skel {
-  IDL_Files {
-  }
-  Source_Files {
-    MessengerConsumer.cpp
-    StructuredEventConsumer_i.cpp
-  }
-}
diff --git a/TAO/DevGuideExamples/NotifyService/Messenger/NotifyServiceMessenger.mpc b/TAO/DevGuideExamples/NotifyService/Messenger/NotifyServiceMessenger.mpc
new file mode 100644
index 00000000000..c6cd2f3d24c
--- /dev/null
+++ b/TAO/DevGuideExamples/NotifyService/Messenger/NotifyServiceMessenger.mpc
@@ -0,0 +1,25 @@
+// $Id$
+
+project(*Server): taoexe, portableserver, namingexe, notification_skel {
+  Source_Files {
+    StructuredEventSupplier_i.cpp
+    MessengerServer.cpp         
+    Messenger_i.cpp
+  }
+}
+
+project(*Client): taoexe, namingexe, notification {
+  Source_Files {
+    MessengerC.cpp
+    MessengerClient.cpp
+  }
+}
+
+project(*Consumer): taoexe, portableserver, namingexe, notification_skel {
+  IDL_Files {
+  }
+  Source_Files {
+    MessengerConsumer.cpp
+    StructuredEventConsumer_i.cpp
+  }
+}
-- 
cgit v1.2.1