*** This commit represents a complete reformatting of the LLDB source code

*** to conform to clang-format’s LLVM style.  This kind of mass change has
*** two obvious implications:

Firstly, merging this particular commit into a downstream fork may be a huge
effort.  Alternatively, it may be worth merging all changes up to this commit,
performing the same reformatting operation locally, and then discarding the
merge for this particular commit.  The commands used to accomplish this
reformatting were as follows (with current working directory as the root of
the repository):

    find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} +
    find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ;

The version of clang-format used was 3.9.0, and autopep8 was 1.2.4.

Secondly, “blame” style tools will generally point to this commit instead of
a meaningful prior commit.  There are alternatives available that will attempt
to look through this change and find the appropriate prior commit.  YMMV.

llvm-svn: 280751

1 files changed, 81 insertions, 82 deletions

diff --git a/lldb/tools/lldb-mi/MIUtilMapIdToVariant.h b/lldb/tools/lldb-mi/MIUtilMapIdToVariant.h
index 1a16490..a56477c 100644
--- a/lldb/tools/lldb-mi/MIUtilMapIdToVariant.h
+++ b/lldb/tools/lldb-mi/MIUtilMapIdToVariant.h
@@ -18,45 +18,49 @@
 #include "MIUtilString.h"
 #include "MIUtilVariant.h"
 
-//++ ============================================================================
+//++
+//============================================================================
 // Details: MI common code utility class. Map type container that hold general
 //          object types (by being a variant wrapper)
 //          objects by ID.
 //--
-class CMIUtilMapIdToVariant : public CMICmnBase
-{
-    // Methods:
-  public:
-    /* ctor */ CMIUtilMapIdToVariant();
-
-    template <typename T> bool Add(const CMIUtilString &vId, const T &vData);
-    void Clear();
-    template <typename T> bool Get(const CMIUtilString &vId, T &vrwData, bool &vrwbFound) const;
-    bool HaveAlready(const CMIUtilString &vId) const;
-    bool IsEmpty() const;
-    bool Remove(const CMIUtilString &vId);
-
-    // Overridden:
-  public:
-    // From CMICmnBase
-    /* dtor */ ~CMIUtilMapIdToVariant() override;
-
-    // Typedefs:
-  private:
-    typedef std::map<CMIUtilString, CMIUtilVariant> MapKeyToVariantValue_t;
-    typedef std::pair<CMIUtilString, CMIUtilVariant> MapPairKeyToVariantValue_t;
-
-    // Methods:
-  private:
-    bool IsValid(const CMIUtilString &vId) const;
-
-    // Attributes:
-    MapKeyToVariantValue_t m_mapKeyToVariantValue;
+class CMIUtilMapIdToVariant : public CMICmnBase {
+  // Methods:
+public:
+  /* ctor */ CMIUtilMapIdToVariant();
+
+  template <typename T> bool Add(const CMIUtilString &vId, const T &vData);
+  void Clear();
+  template <typename T>
+  bool Get(const CMIUtilString &vId, T &vrwData, bool &vrwbFound) const;
+  bool HaveAlready(const CMIUtilString &vId) const;
+  bool IsEmpty() const;
+  bool Remove(const CMIUtilString &vId);
+
+  // Overridden:
+public:
+  // From CMICmnBase
+  /* dtor */ ~CMIUtilMapIdToVariant() override;
+
+  // Typedefs:
+private:
+  typedef std::map<CMIUtilString, CMIUtilVariant> MapKeyToVariantValue_t;
+  typedef std::pair<CMIUtilString, CMIUtilVariant> MapPairKeyToVariantValue_t;
+
+  // Methods:
+private:
+  bool IsValid(const CMIUtilString &vId) const;
+
+  // Attributes:
+  MapKeyToVariantValue_t m_mapKeyToVariantValue;
 };
 
-//++ ------------------------------------------------------------------------------------
-// Details: Add to *this container a data object of general type identified by an ID.
-//          If the data with that ID already exists in the container it is replace with
+//++
+//------------------------------------------------------------------------------------
+// Details: Add to *this container a data object of general type identified by
+// an ID.
+//          If the data with that ID already exists in the container it is
+//          replace with
 //          the new data specified.
 // Type:    Method.
 // Args:    T       - The data object's variable type.
@@ -67,29 +71,28 @@ class CMIUtilMapIdToVariant : public CMICmnBase
 // Throws:  None.
 //--
 template <typename T>
-bool
-CMIUtilMapIdToVariant::Add(const CMIUtilString &vId, const T &vData)
-{
-    if (!IsValid(vId))
-    {
-        SetErrorDescription(CMIUtilString::Format(MIRSRC(IDS_VARIANT_ERR_MAP_KEY_INVALID), vId.c_str()));
-        return MIstatus::failure;
-    }
-
-    const bool bOk = HaveAlready(vId) ? Remove(vId) : MIstatus::success;
-    if (bOk)
-    {
-        CMIUtilVariant data;
-        data.Set<T>(vData);
-        MapPairKeyToVariantValue_t pr(vId, data);
-        m_mapKeyToVariantValue.insert(pr);
-    }
-
-    return bOk;
+bool CMIUtilMapIdToVariant::Add(const CMIUtilString &vId, const T &vData) {
+  if (!IsValid(vId)) {
+    SetErrorDescription(CMIUtilString::Format(
+        MIRSRC(IDS_VARIANT_ERR_MAP_KEY_INVALID), vId.c_str()));
+    return MIstatus::failure;
+  }
+
+  const bool bOk = HaveAlready(vId) ? Remove(vId) : MIstatus::success;
+  if (bOk) {
+    CMIUtilVariant data;
+    data.Set<T>(vData);
+    MapPairKeyToVariantValue_t pr(vId, data);
+    m_mapKeyToVariantValue.insert(pr);
+  }
+
+  return bOk;
 }
 
-//++ ------------------------------------------------------------------------------------
-// Details: Retrieve a data object from *this container identified by the specified ID.
+//++
+//------------------------------------------------------------------------------------
+// Details: Retrieve a data object from *this container identified by the
+// specified ID.
 // Type:    Method.
 // Args:    T           - The data object's variable type.
 //          vId         - (R) Unique ID i.e. GUID.
@@ -100,34 +103,30 @@ CMIUtilMapIdToVariant::Add(const CMIUtilString &vId, const T &vData)
 // Throws:  None.
 //--
 template <typename T>
-bool
-CMIUtilMapIdToVariant::Get(const CMIUtilString &vId, T &vrwData, bool &vrwbFound) const
-{
-    vrwbFound = false;
-
-    if (!IsValid(vId))
-    {
-        SetErrorDescription(CMIUtilString::Format(MIRSRC(IDS_VARIANT_ERR_MAP_KEY_INVALID), vId.c_str()));
-        return MIstatus::failure;
-    }
-
-    const MapKeyToVariantValue_t::const_iterator it = m_mapKeyToVariantValue.find(vId);
-    if (it != m_mapKeyToVariantValue.end())
-    {
-        const CMIUtilVariant &rData = (*it).second;
-        const T *pDataObj = rData.Get<T>();
-        if (pDataObj != nullptr)
-        {
-            vrwbFound = true;
-            vrwData = *pDataObj;
-            return MIstatus::success;
-        }
-        else
-        {
-            SetErrorDescription(MIRSRC(IDS_VARIANT_ERR_USED_BASECLASS));
-            return MIstatus::failure;
-        }
+bool CMIUtilMapIdToVariant::Get(const CMIUtilString &vId, T &vrwData,
+                                bool &vrwbFound) const {
+  vrwbFound = false;
+
+  if (!IsValid(vId)) {
+    SetErrorDescription(CMIUtilString::Format(
+        MIRSRC(IDS_VARIANT_ERR_MAP_KEY_INVALID), vId.c_str()));
+    return MIstatus::failure;
+  }
+
+  const MapKeyToVariantValue_t::const_iterator it =
+      m_mapKeyToVariantValue.find(vId);
+  if (it != m_mapKeyToVariantValue.end()) {
+    const CMIUtilVariant &rData = (*it).second;
+    const T *pDataObj = rData.Get<T>();
+    if (pDataObj != nullptr) {
+      vrwbFound = true;
+      vrwData = *pDataObj;
+      return MIstatus::success;
+    } else {
+      SetErrorDescription(MIRSRC(IDS_VARIANT_ERR_USED_BASECLASS));
+      return MIstatus::failure;
     }
+  }
 
-    return MIstatus::success;
+  return MIstatus::success;
 }