On 31-10-2018 15:14, kefu chai wrote:
On Wed, Oct 31, 2018 at 7:57 PM Willem Jan Withagen <wjw@xxxxxxxxxxx> wrote:
Xie Xingguo,
Do you have suggestions on how to fix this.
i am not Xingguo. my 2 cents is to
#ifdef HAVE_STDLIB_MAP_SPLICING
// use .merge()
#else
// use .insert()
#endif
Thanx,
Got that working and master-jenkins is happy again.
--WjW
Thanx,
--WjW
/home/jenkins/workspace/ceph-master/src/mon/OSDMonitor.cc:8679:18:
error: no member named 'merge' in
'std::__1::map<std::__1::basic_string<char>,
std::__1::map<std::__1::basic_string<char>,
std::__1::basic_string<char>,
std::__1::less<std::__1::basic_string<char> >,
std::__1::allocator<std::__1::pair<const std::__1::basic_string<char>,
std::__1::basic_string<char> > > >,
std::__1::less<std::__1::basic_string<char> >,
mempool::pool_allocator<mempool::mempool_osdmap, std::__1::pair<const
std::__1::basic_string<char>,
std::__1::map<std::__1::basic_string<char>,
std::__1::basic_string<char>,
std::__1::less<std::__1::basic_string<char> >,
std::__1::allocator<std::__1::pair<const std::__1::basic_string<char>,
std::__1::basic_string<char> > > > > > >'
ec_profiles.merge(old_ec_profiles);
~~~~~~~~~~~ ^
1 error generated.
gmake[2]: *** [src/mon/CMakeFiles/mon.dir/build.make:128:
src/mon/CMakeFiles/mon.dir/OSDMonitor.cc.o] Error 1
gmake[2]: *** Waiting for unfinished jobs....
