From owner-svn-src-all@FreeBSD.ORG Thu Feb 7 11:08:03 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id CCEFFD99; Thu, 7 Feb 2013 11:08:03 +0000 (UTC) (envelope-from theraven@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B5993721; Thu, 7 Feb 2013 11:08:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r17B83uG018916; Thu, 7 Feb 2013 11:08:03 GMT (envelope-from theraven@svn.freebsd.org) Received: (from theraven@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r17B83Qi018915; Thu, 7 Feb 2013 11:08:03 GMT (envelope-from theraven@svn.freebsd.org) Message-Id: <201302071108.r17B83Qi018915@svn.freebsd.org> From: David Chisnall Date: Thu, 7 Feb 2013 11:08:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r246462 - head/contrib/libcxxrt 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.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Feb 2013 11:08:03 -0000 Author: theraven Date: Thu Feb 7 11:08:03 2013 New Revision: 246462 URL: http://svnweb.freebsd.org/changeset/base/246462 Log: Fix a copy-and-paste error in libcxxrt. Modified: head/contrib/libcxxrt/exception.cc Modified: head/contrib/libcxxrt/exception.cc ============================================================================== --- head/contrib/libcxxrt/exception.cc Thu Feb 7 11:01:56 2013 (r246461) +++ head/contrib/libcxxrt/exception.cc Thu Feb 7 11:08:03 2013 (r246462) @@ -1387,7 +1387,7 @@ namespace std { if (thread_local_handlers) { return pathscale::set_unexpected(f); } - return ATOMIC_SWAP(&terminateHandler, f); + return ATOMIC_SWAP(&unexpectedHandler, f); } /** * Sets the function that is called to terminate the program.