From owner-svn-src-projects@freebsd.org Wed May 25 17:10:11 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D2950B4AB27 for ; Wed, 25 May 2016 17:10:11 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 ADBF410D8; Wed, 25 May 2016 17:10:11 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4PHAA9w005355; Wed, 25 May 2016 17:10:10 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4PHAAxU005350; Wed, 25 May 2016 17:10:10 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201605251710.u4PHAAxU005350@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 25 May 2016 17:10:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r300690 - in projects/zfsd/head: cddl/usr.sbin/zfsd lib/libdevdctl X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 May 2016 17:10:11 -0000 Author: asomers Date: Wed May 25 17:10:10 2016 New Revision: 300690 URL: https://svnweb.freebsd.org/changeset/base/300690 Log: Fix the zfsd build on sparc64 lib/libdevdctl/event.cc cddl/usr.sbin/zfsd/case_file.cc Remove C++11isms cddl/usr.sbin/zfsd/vdev.cc cddl/usr.sbin/zfsd/zfsd_event.cc Undefine the flush macro, which is defined by cpufunc.h for sparc64 only. It conficts with std::[io]stream::flush Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/cddl/usr.sbin/zfsd/case_file.cc projects/zfsd/head/cddl/usr.sbin/zfsd/vdev.cc projects/zfsd/head/cddl/usr.sbin/zfsd/zfsd_event.cc projects/zfsd/head/lib/libdevdctl/event.cc Modified: projects/zfsd/head/cddl/usr.sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/usr.sbin/zfsd/case_file.cc Wed May 25 16:38:10 2016 (r300689) +++ projects/zfsd/head/cddl/usr.sbin/zfsd/case_file.cc Wed May 25 17:10:10 2016 (r300690) @@ -143,7 +143,8 @@ CaseFile::ReEvaluateByGuid(Guid poolGUID { CaseFileList::iterator casefile; for (casefile = s_activeCases.begin(); casefile != s_activeCases.end();){ - CaseFileList::iterator next = std::next(casefile); + CaseFileList::iterator next = casefile; + next++; if (poolGUID == (*casefile)->PoolGUID()) (*casefile)->ReEvaluate(event); casefile = next; Modified: projects/zfsd/head/cddl/usr.sbin/zfsd/vdev.cc ============================================================================== --- projects/zfsd/head/cddl/usr.sbin/zfsd/vdev.cc Wed May 25 16:38:10 2016 (r300689) +++ projects/zfsd/head/cddl/usr.sbin/zfsd/vdev.cc Wed May 25 17:10:10 2016 (r300690) @@ -42,6 +42,11 @@ #include #include +/* + * Undefine flush, defined by cpufunc.h on sparc64, because it conflicts with + * C++ flush methods + */ +#undef flush #include #include Modified: projects/zfsd/head/cddl/usr.sbin/zfsd/zfsd_event.cc ============================================================================== --- projects/zfsd/head/cddl/usr.sbin/zfsd/zfsd_event.cc Wed May 25 16:38:10 2016 (r300689) +++ projects/zfsd/head/cddl/usr.sbin/zfsd/zfsd_event.cc Wed May 25 17:10:10 2016 (r300690) @@ -40,6 +40,11 @@ #include #include +/* + * Undefine flush, defined by cpufunc.h on sparc64, because it conflicts with + * C++ flush methods + */ +#undef flush #include #include Modified: projects/zfsd/head/lib/libdevdctl/event.cc ============================================================================== --- projects/zfsd/head/lib/libdevdctl/event.cc Wed May 25 16:38:10 2016 (r300689) +++ projects/zfsd/head/lib/libdevdctl/event.cc Wed May 25 17:10:10 2016 (r300690) @@ -44,12 +44,12 @@ #include #include +#include #include #include #include #include -#include #include #include #include @@ -69,9 +69,7 @@ __FBSDID("$FreeBSD$"); #define NUM_ELEMENTS(x) (sizeof(x) / sizeof(*x)) /*============================ Namespace Control =============================*/ -using std::begin; using std::cout; -using std::end; using std::endl; using std::string; using std::stringstream; @@ -135,7 +133,8 @@ Event::DevName(std::string &name) const bool Event::IsDiskDev() const { - static const char *diskDevNames[] = + const int numDrivers = 2; + static const char *diskDevNames[numDrivers] = { "da", "ada" @@ -154,7 +153,8 @@ Event::IsDiskDev() const find_start++; } - for (dName = begin(diskDevNames); dName <= end(diskDevNames); dName++) { + for (dName = &diskDevNames[0]; + dName <= &diskDevNames[numDrivers - 1]; dName++) { size_t loc(devName.find(*dName, find_start)); if (loc == find_start) {