On 11/30/13 00:08, [email protected] wrote:
> ---Begin Environment---
> OSVERSION=1000500
> UNAME_v=FreeBSD 10.0-BETA1 r256420
> UNAME_r=10.0-BETA1
> BLOCKSIZE=K
> MAIL=/var/mail/root
> PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:/root/bin
> STATUS=1
> MASTERMNT=/usr/local/poudriere/data/build/10amd64-default/ref
> PKG_EXT=txz
> tpid=20843
> POUDRIERE_BUILD_TYPE=bulk
> PKGNG=1
> PKGNAME=bro-2.2
> PKG_DELETE=/usr/local/sbin/pkg-static delete -y -f
> PKG_ADD=/usr/local/sbin/pkg-static add
> PWD=/root
> MASTERNAME=10amd64-default
> USER=root
> HOME=/root
> POUDRIERE_VERSION=3.1-pre
> LOCALBASE=/usr/local
> PACKAGE_BUILDING=yes
> PKG_VERSION=/poudriere/pkg-static version
> PKG_BIN=/usr/local/sbin/pkg-static
> ---End Environment---

I've asked before but it would be really helpful if these reports
included the version of clang being used.

> [ 94%] Building CXX object src/CMakeFiles/bro.dir/logging/writers/SQLite.cc.o
> cd /wrkdirs/usr/ports/security/bro/work/.build/src && /usr/bin/c++    -O2 
> -pipe -fno-strict-aliasing -Wall -Wno-unused -O2 -g -DNDEBUG 
> -I/wrkdirs/usr/ports/security/bro/work/.build/src 
> -I/wrkdirs/usr/ports/security/bro/work/bro-2.2/src -I/usr/local/include 
> -I/wrkdirs/usr/ports/security/bro/work/.build/aux/binpac/lib 
> -I/wrkdirs/usr/ports/security/bro/work/bro-2.2/aux/binpac/lib 
> -I/wrkdirs/usr/ports/security/bro/work/.build -o 
> CMakeFiles/bro.dir/logging/writers/SQLite.cc.o -c 
> /wrkdirs/usr/ports/security/bro/work/bro-2.2/src/logging/writers/SQLite.cc
> /wrkdirs/usr/ports/security/bro/work/bro-2.2/src/logging/writers/SQLite.cc:129:48:
>  error: no viable conversion from 
> '__map_const_iterator<__tree_const_iterator<struct std::__1::map<const char 
> *, const char *, struct CompareString, class std::__1::allocator<struct 
> std::__1::pair<const char *const, const char *> > >::__value_type, class 
> std::__1::__tree_node<struct std::__1::map<const char *, const char *, struct 
> CompareString, class std::__1::allocator<struct std::__1::pair<const char 
> *const, const char *> > >::__value_type, void *> *, [...]>>' to 
> '__map_const_iterator<__tree_const_iterator<struct std::__1::map<const char 
> *, const char *, struct std::__1::less<const char *>, class 
> std::__1::allocator<struct std::__1::pair<const char *const, const char *> > 
> >::__value_type, class std::__1::__tree_node<struct std::__1::map<const char 
> *, const char *, struct std::__1::less<const char *>, class 
> std::__1::allocator<struct std::__1::pair<const char *const, const char *> > 
> >::__va!
 lu!
>  e_type, v
>  oid *> *, [...]>>'
>         map<const char*, const char*>::const_iterator it = 
> info.config.find("tablename");
>                                                       ^    
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> /usr/include/c++/v1/map:564:24: note: candidate constructor (the implicit 
> copy constructor) not viable: no known conversion from 'const_iterator' (aka 
> '__map_const_iterator<typename __base::const_iterator>') to 'const 
> std::__1::__map_const_iterator<std::__1::__tree_const_iterator<std::__1::map<const
>  char *, const char *, std::__1::less<const char *>, 
> std::__1::allocator<std::__1::pair<const char *const, const char *> > 
> >::__value_type, std::__1::__tree_node<std::__1::map<const char *, const char 
> *, std::__1::less<const char *>, std::__1::allocator<std::__1::pair<const 
> char *const, const char *> > >::__value_type, void *> *, long> > &' for 1st 
> argument
> class _LIBCPP_TYPE_VIS __map_const_iterator
>                        ^
> /usr/include/c++/v1/map:588:5: note: candidate constructor not viable: no 
> known conversion from 'const_iterator' (aka '__map_const_iterator<typename 
> __base::const_iterator>') to 
> 'std::__1::__tree_const_iterator<std::__1::map<const char *, const char *, 
> std::__1::less<const char *>, std::__1::allocator<std::__1::pair<const char 
> *const, const char *> > >::__value_type, 
> std::__1::__tree_node<std::__1::map<const char *, const char *, 
> std::__1::less<const char *>, std::__1::allocator<std::__1::pair<const char 
> *const, const char *> > >::__value_type, void *> *, long>' for 1st argument
>     __map_const_iterator(_TreeIterator __i) _NOEXCEPT : __i_(__i) {}
>     ^
> /usr/include/c++/v1/map:590:5: note: candidate constructor not viable: no 
> known conversion from 'const_iterator' (aka '__map_const_iterator<typename 
> __base::const_iterator>') to '__map_iterator<typename 
> __tree_const_iterator<__value_type, __tree_node<__value_type, void *> *, 
> long>::__non_const_iterator>' for 1st argument
>     __map_const_iterator(
>     ^
> 1 error generated.
> *** Error code 1

The Bro developers generated the attached patch; could someone please
see if it solves this for clang-infinity?

Thanks!

                Craig
diff --git a/src/logging/writers/SQLite.cc b/src/logging/writers/SQLite.cc
index 46d1f17..25f5cb0 100644
--- a/src/logging/writers/SQLite.cc
+++ b/src/logging/writers/SQLite.cc
@@ -126,7 +126,7 @@ bool SQLite::DoInit(const WriterInfo& info, int 
arg_num_fields,
        fullpath.append(".sqlite");
        string tablename;
 
-       map<const char*, const char*>::const_iterator it = 
info.config.find("tablename");
+       WriterInfo::config_map::const_iterator it = 
info.config.find("tablename");
        if ( it == info.config.end() )
                {
                MsgThread::Info(Fmt("tablename configuration option not found. 
Defaulting to path %s", info.path));

_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-pkg-fallout
To unsubscribe, send any mail to "[email protected]"

Reply via email to