4 files changed, 17 insertions, 21 deletions
diff --git a/lldb/include/lldb/Interpreter/CommandInterpreter.h b/lldb/include/lldb/Interpreter/CommandInterpreter.h
index 4d950e4940f..5aaeccb7f54 100644
--- a/lldb/include/lldb/Interpreter/CommandInterpreter.h
+++ b/lldb/include/lldb/Interpreter/CommandInterpreter.h
@@ -533,10 +533,6 @@ public:
     bool
     GetSynchronous ();
     
-    template <typename ValueType>
-    size_t
-    FindLongestCommandWord (std::map<std::string,ValueType> &dict);
-
     void
     FindCommandsForApropos (const char *word, 
                             StringList &commands_found, 
diff --git a/lldb/include/lldb/Interpreter/CommandObject.h b/lldb/include/lldb/Interpreter/CommandObject.h
index 4d2056332b3..b78b22c386b 100644
--- a/lldb/include/lldb/Interpreter/CommandObject.h
+++ b/lldb/include/lldb/Interpreter/CommandObject.h
@@ -70,7 +70,23 @@ AddNamesMatchingPartialString (std::map<std::string,ValueType> &in_map, const ch
     }
     return number_added;    
 }
+
+template <typename ValueType>
+size_t
+FindLongestCommandWord (std::map<std::string,ValueType> &dict)
+{
+    auto end = dict.end();
+    size_t max_len = 0;
     
+    for (auto pos = dict.begin(); pos != end; ++pos)
+    {
+        size_t len = pos->first.size();
+        if (max_len < len)
+            max_len = len;
+    }
+    return max_len;
+}
+
 class CommandObject
 {
 public:
diff --git a/lldb/source/Commands/CommandObjectMultiword.cpp b/lldb/source/Commands/CommandObjectMultiword.cpp
index 18e162dcec4..887ce24765f 100644
--- a/lldb/source/Commands/CommandObjectMultiword.cpp
+++ b/lldb/source/Commands/CommandObjectMultiword.cpp
@@ -181,7 +181,7 @@ CommandObjectMultiword::GenerateHelpText (Stream &output_stream)
     output_stream.PutCString ("The following subcommands are supported:\n\n");
 
     CommandMap::iterator pos;
-    uint32_t max_len = m_interpreter.FindLongestCommandWord (m_subcommand_dict);
+    uint32_t max_len = FindLongestCommandWord (m_subcommand_dict);
 
     if (max_len)
         max_len += 4; // Indent the output by 4 spaces.
diff --git a/lldb/source/Interpreter/CommandInterpreter.cpp b/lldb/source/Interpreter/CommandInterpreter.cpp
index bf8ac43b105..bfbfabbd469 100644
--- a/lldb/source/Interpreter/CommandInterpreter.cpp
+++ b/lldb/source/Interpreter/CommandInterpreter.cpp
@@ -1200,22 +1200,6 @@ CommandInterpreter::GetAliasHelp (const char *alias_name, const char *command_na
     help_string.Printf ("'");
 }
 
-template <typename ValueType>
-size_t
-CommandInterpreter::FindLongestCommandWord (std::map<std::string,ValueType> &dict)
-{
-    auto end = dict.end();
-    size_t max_len = 0;
-
-    for (auto pos = dict.begin(); pos != end; ++pos)
-    {
-        size_t len = pos->first.size();
-        if (max_len < len)
-            max_len = len;
-    }
-    return max_len;
-}
-
 void
 CommandInterpreter::GetHelp (CommandReturnObject &result,
                              uint32_t cmd_types)