svn commit: r280789 - head/contrib/llvm/tools/lldb/source/Core

[Ed Maste]

Author: emaste
Date: Sat Mar 28 18:29:13 2015
New Revision: 280789
URL: https://svnweb.freebsd.org/changeset/base/280789

Log:
  Import lldb r233478: Fix build failure on Freebsd with gcc 4.9.
  
  llvm.org/pr23051
  
  Submitted by:	rodrigc

Modified:
  head/contrib/llvm/tools/lldb/source/Core/Mangled.cpp

Modified: head/contrib/llvm/tools/lldb/source/Core/Mangled.cpp
==============================================================================
--- head/contrib/llvm/tools/lldb/source/Core/Mangled.cpp	Sat Mar 28 16:59:57 2015	(r280788)
+++ head/contrib/llvm/tools/lldb/source/Core/Mangled.cpp	Sat Mar 28 18:29:13 2015	(r280789)
@@ -4886,7 +4886,7 @@ struct string_pair
 
 struct Db
 {
-    typedef String String;
+    typedef ::String String;
     typedef Vector<string_pair> sub_type;
     typedef Vector<sub_type> template_param_type;
     Vector<string_pair> names;