From owner-freebsd-toolchain@freebsd.org  Sun Apr  1 12:19:35 2018
Return-Path: <owner-freebsd-toolchain@freebsd.org>
Delivered-To: freebsd-toolchain@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7C6DBF9161F
 for <freebsd-toolchain@mailman.ysv.freebsd.org>;
 Sun,  1 Apr 2018 12:19:35 +0000 (UTC) (envelope-from wjw@digiware.nl)
Received: from smtp.digiware.nl (smtp.digiware.nl [IPv6:2001:4cb8:90:ffff::3])
 (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 18CD368560;
 Sun,  1 Apr 2018 12:19:35 +0000 (UTC) (envelope-from wjw@digiware.nl)
Received: from router.digiware.nl (localhost.digiware.nl [127.0.0.1])
 by smtp.digiware.nl (Postfix) with ESMTP id DF5822E39C;
 Sun,  1 Apr 2018 14:19:32 +0200 (CEST)
X-Virus-Scanned: amavisd-new at digiware.com
Received: from smtp.digiware.nl ([127.0.0.1])
 by router.digiware.nl (router.digiware.nl [127.0.0.1]) (amavisd-new,
 port 10024)
 with ESMTP id cgI6z3M-vf_7; Sun,  1 Apr 2018 14:19:32 +0200 (CEST)
Received: from [192.168.11.152] (unknown [192.168.11.152])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (No client certificate requested)
 by smtp.digiware.nl (Postfix) with ESMTPSA id 436672E39A;
 Sun,  1 Apr 2018 14:19:32 +0200 (CEST)
To: FreeBSD Toolchain <freebsd-toolchain@freebsd.org>,
 Dimitry Andric <dim@FreeBSD.org>
From: Willem Jan Withagen <wjw@digiware.nl>
Subject: Looking for std::map::merge when compiling for Clang...
Message-ID: <7f0f0f04-7073-ba49-526d-82330b1d0842@digiware.nl>
Date: Sun, 1 Apr 2018 14:19:30 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101
 Thunderbird/52.7.0
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-GB
Content-Transfer-Encoding: 7bit
X-BeenThere: freebsd-toolchain@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: Maintenance of FreeBSD's integrated toolchain
 <freebsd-toolchain.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-toolchain>, 
 <mailto:freebsd-toolchain-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-toolchain/>
List-Post: <mailto:freebsd-toolchain@freebsd.org>
List-Help: <mailto:freebsd-toolchain-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-toolchain>, 
 <mailto:freebsd-toolchain-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Apr 2018 12:19:35 -0000

Hi,

I'm trying to compile a src file with Ceph that has been upgrade to use 
more of the C++17 features, but it fails on a missing function:

/home/jenkins/workspace/ceph-master/src/mds/OpenFileTable.cc:349:26: 
error: no member named 'merge' in 
'std::__1::map<std::__1::basic_string<char>, ceph::buffer::list, 
std::__1::less<std::__1::basic_string<char> >, 
std::__1::allocator<std::__1::pair<const std::__1::basic_string<char>, 
ceph::buffer::list> > >'
     ctl.journaled_update.merge(ctl.to_update);
     ~~~~~~~~~~~~~~~~~~~~ ^

The actual code looks like:
====
     ctl.journaled_update.merge(ctl.to_update);
     //ctl.journaled_update.insert(ctl.to_update.begin(), 
ctl.to_update.end());

     // ctl.journaled_remove.merge(ctl.to_remove);
     ctl.journaled_remove.insert(ctl.to_remove.begin(), 
ctl.to_remove.end());
====
The first "merge" fails, but the second (old code) works.

It does compile on Linux/GCC, so probably there is a wrong/missing 
include, given the error.
But which one???

included are:
#include <iosfwd>
#include <list>
#include <map>
#include <set>
#include <string>
#include <string_view>

Suggestions?

Thanx,
--WjW