Fix: Properly scope bmqstoragetool typedefs

This patch moves three globally exported typedefs into the class they
are used by.  This avoids a warning from Clang about these typedefs
shadowing similarly named typedefs in files that include this header.

Signed-off-by: Patrick M. Niedzielski <[email protected]>

Author: pniedzielski

src/applications/bmqstoragetool/m_bmqstoragetool_cslprinter.cpp

@@ -61,18 +61,18 @@ void printQueueInfo(bsl::ostream&     ostream,
                     unsigned int      queuesLimit,
                     bslma::Allocator* allocator)
 {
-    const QueueInfos& queueInfos = queueMap.queueInfos();
+    const QueueMap::QueueInfos& queueInfos = queueMap.queueInfos();
     if (!queueInfos.empty()) {
         ostream << ",\n";
-        QueueInfos::const_iterator itEnd = queueInfos.cend();
+        QueueMap::QueueInfos::const_iterator itEnd = queueInfos.cend();
         if (queueInfos.size() > queuesLimit) {
             ostream << "    \"First" << queuesLimit << "Queues\": [";
             itEnd = queueInfos.cbegin() + queuesLimit;
         }
         else {
             ostream << "    \"Queues\": [";
         }
-        QueueInfos::const_iterator it = queueInfos.cbegin();
+        QueueMap::QueueInfos::const_iterator it = queueInfos.cbegin();
         for (; it != itEnd; ++it) {
             if (it != queueInfos.cbegin()) {
                 ostream << ",";

src/applications/bmqstoragetool/m_bmqstoragetool_queuemap.cpp

@@ -114,9 +114,9 @@ QueueMap::findKeyByUri(const bsl::string& uri) const
     return result;
 }
 
-QueueInfos QueueMap::queueInfos() const
+QueueMap::QueueInfos QueueMap::queueInfos() const
 {
-    QueueInfos result(d_allocator_p);
+    QueueMap::QueueInfos result(d_allocator_p);
     result.reserve(d_queueKeyToInfoMap.size());
 
     QueueKeyToInfoMap::const_iterator it = d_queueKeyToInfoMap.begin();

src/applications/bmqstoragetool/m_bmqstoragetool_queuemap.h

@@ -37,18 +37,21 @@
 namespace BloombergLP {
 namespace m_bmqstoragetool {
 
-/// Map of queue key -> queue info.
-typedef bsl::unordered_map<mqbu::StorageKey, bmqp_ctrlmsg::QueueInfo>
-    QueueKeyToInfoMap;
-/// Map of queue uri -> queue key.
-typedef bsl::unordered_map<bsl::string, mqbu::StorageKey> QueueUriToKeyMap;
-/// Collection of queue infos.
-typedef bsl::vector<bmqp_ctrlmsg::QueueInfo> QueueInfos;
-
 // ==============
 // class QueueMap
 // ==============
 class QueueMap {
+  public:
+    // PUBLIC TYPES
+
+    /// Map of queue key -> queue info.
+    typedef bsl::unordered_map<mqbu::StorageKey, bmqp_ctrlmsg::QueueInfo>
+        QueueKeyToInfoMap;
+    /// Map of queue uri -> queue key.
+    typedef bsl::unordered_map<bsl::string, mqbu::StorageKey> QueueUriToKeyMap;
+    /// Collection of queue infos.
+    typedef bsl::vector<bmqp_ctrlmsg::QueueInfo> QueueInfos;
+
   private:
     // PRIVATE DATA