From owner-svn-src-all@FreeBSD.ORG  Sat Mar 28 18:29:14 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 98216845;
 Sat, 28 Mar 2015 18:29:14 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 82D58400;
 Sat, 28 Mar 2015 18:29:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2SITEJF081850;
 Sat, 28 Mar 2015 18:29:14 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2SITErS081849;
 Sat, 28 Mar 2015 18:29:14 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201503281829.t2SITErS081849@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Sat, 28 Mar 2015 18:29:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r280789 - head/contrib/llvm/tools/lldb/source/Core
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Mar 2015 18:29:14 -0000

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;