BUG#: 6493

TITLE: remove unused Message Mask types from Message.
DESCRIPTION: checking in approved fix.

diff --git a/src/Pegasus/Common/Message.cpp b/src/Pegasus/Common/Message.cpp
index d075dfd566486aee887b4d2fc87286bbb9fbbe13..eb455d6e194e62eeb61164f00bf27dd2dff5828b 100644 (file)
--- a/src/Pegasus/Common/Message.cpp
+++ b/src/Pegasus/Common/Message.cpp
@@ -39,10 +39,6 @@ PEGASUS_USING_STD;
 
 PEGASUS_NAMESPACE_BEGIN
 
-Uint32 MessageMask::type_legacy =            0x00000000;
-Uint32 MessageMask::type_cimom =             0x00000001;
-Uint32 MessageMask::type_service =           0x00000002;
-
 Uint32 MessageMask::ha_request =             0x00100000;
 Uint32 MessageMask::ha_reply =               0x00200000;
 Uint32 MessageMask::ha_async =               0x00400000;

diff --git a/src/Pegasus/Common/Message.h b/src/Pegasus/Common/Message.h
index 3776a0c3bf02d27e37b754787115464c0ef39866..9b47134bccda5df66e9a382d45b8b7128e3b8267 100644 (file)
--- a/src/Pegasus/Common/Message.h
+++ b/src/Pegasus/Common/Message.h
@@ -49,12 +49,6 @@ PEGASUS_NAMESPACE_BEGIN
 class PEGASUS_COMMON_LINKAGE MessageMask
 {
 public:
-    // Message type is indicated by the low order 20 bits.  For example:
-    // Uint32 messageType = flags & 0x000fffff;
-    static Uint32 type_legacy;
-    static Uint32 type_cimom;
-    static Uint32 type_service;
-
     // Message handling is indicated by the high order 12 bits.  For example:
     // Uint32 messageHandling = flags & 0xfff00000;
     static Uint32 ha_request;
@@ -81,7 +75,7 @@ public:
     Message(
         Uint32 type,
         Uint32 destination = 0,
-        Uint32 mask = MessageMask::type_legacy)
+        Uint32 mask = 0)
         :
         _type(type),
         _mask(mask),

diff --git a/src/Pegasus/Common/MessageQueueService.h b/src/Pegasus/Common/MessageQueueService.h
index 1fcbbe753c332d37abce8b7a34d591c4eaa78740..939a2d72644f102de42272972b5ffc83c8feb898 100644 (file)
--- a/src/Pegasus/Common/MessageQueueService.h
+++ b/src/Pegasus/Common/MessageQueueService.h
@@ -65,9 +65,7 @@ public:
         const char* name,
         Uint32 queueID = MessageQueue::getNextQueueId(),
         Uint32 capabilities = 0,
-        Uint32 mask = MessageMask::type_cimom |
-            MessageMask::type_service |
-            MessageMask::ha_request |
+        Uint32 mask = MessageMask::ha_request |
             MessageMask::ha_reply |
             MessageMask::ha_async);
 

diff --git a/src/Pegasus/Common/tests/MessageQueueService/MessageQueueService.cpp b/src/Pegasus/Common/tests/MessageQueueService/MessageQueueService.cpp
index f595ca174b2abfe09821fe066fd793ef497f10c2..1f11119f0ecfaf57c6692837c81dd1cd64cd0370 100644 (file)
--- a/src/Pegasus/Common/tests/MessageQueueService/MessageQueueService.cpp
+++ b/src/Pegasus/Common/tests/MessageQueueService/MessageQueueService.cpp
@@ -128,8 +128,6 @@ public:
     MessageQueueServer(const char *name)
     : Base(
         name, MessageQueue::getNextQueueId(), 0,
-        MessageMask::type_cimom |
-            MessageMask::type_service |
             MessageMask::ha_request |
             MessageMask::ha_reply |
             MessageMask::ha_async),
@@ -173,8 +171,6 @@ class MessageQueueClient : public MessageQueueService
 
       MessageQueueClient(const char *name)
          : Base(name, MessageQueue::getNextQueueId(), 0,
-                MessageMask::type_cimom |
-                MessageMask::type_service |
                 MessageMask::ha_request |
                 MessageMask::ha_reply |
                 MessageMask::ha_async),

diff --git a/src/Pegasus/Common/tests/ModuleController/ModuleController.cpp b/src/Pegasus/Common/tests/ModuleController/ModuleController.cpp
index d7f3160b7e4bacf298cdd9e245acc5661a50c45c..4d990287e0858d2aece2ceadd78d2c0aa8a92e60 100644 (file)
--- a/src/Pegasus/Common/tests/ModuleController/ModuleController.cpp
+++ b/src/Pegasus/Common/tests/ModuleController/ModuleController.cpp
@@ -285,8 +285,6 @@ class test_service : public MessageQueueService
 
 test_service::test_service(const char *name)
          : Base(name, 0, 
-        MessageMask::type_cimom | 
-        MessageMask::type_service | 
         MessageMask::ha_request | 
         MessageMask::ha_reply | 
         MessageMask::ha_async )