From owner-svn-src-head@FreeBSD.ORG  Tue Oct 23 18:38:05 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 91DB5AC;
 Tue, 23 Oct 2012 18:38:05 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 789248FC0C;
 Tue, 23 Oct 2012 18:38:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9NIc5Sj031375;
 Tue, 23 Oct 2012 18:38:05 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9NIc5jA031373;
 Tue, 23 Oct 2012 18:38:05 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201210231838.q9NIc5jA031373@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Tue, 23 Oct 2012 18:38:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r241958 - in head/contrib/atf: atf-report atf-run
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Oct 2012 18:38:05 -0000

Author: dim
Date: Tue Oct 23 18:38:04 2012
New Revision: 241958
URL: http://svn.freebsd.org/changeset/base/241958

Log:
  Fix two clang warnings in the recent atf import.  These have also been
  sent upstream.
  
  Tested by:	Garrett Cooper <yanegomi@gmail.com>

Modified:
  head/contrib/atf/atf-report/atf-report.cpp
  head/contrib/atf/atf-run/io.hpp

Modified: head/contrib/atf/atf-report/atf-report.cpp
==============================================================================
--- head/contrib/atf/atf-report/atf-report.cpp	Tue Oct 23 18:36:07 2012	(r241957)
+++ head/contrib/atf/atf-report/atf-report.cpp	Tue Oct 23 18:38:04 2012	(r241958)
@@ -381,7 +381,6 @@ public:
 class xml_writer : public writer {
     ostream_ptr m_os;
 
-    size_t m_curtp, m_ntps;
     std::string m_tcname, m_tpname;
 
     static

Modified: head/contrib/atf/atf-run/io.hpp
==============================================================================
--- head/contrib/atf/atf-run/io.hpp	Tue Oct 23 18:36:07 2012	(r241957)
+++ head/contrib/atf/atf-run/io.hpp	Tue Oct 23 18:38:04 2012	(r241958)
@@ -378,11 +378,6 @@ class pistream :
     public std::istream, utils::noncopyable
 {
     //!
-    //! \brief The file handle managed by this stream.
-    //!
-    int m_fd;
-
-    //!
     //! \brief The systembuf object used to manage this stream's data.
     //!
     systembuf m_systembuf;