Date: Sun, 23 Sep 2012 14:45:34 +0000 (UTC) From: Boris Samorodov <bsam@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r304742 - in head/devel/ice: . files Message-ID: <201209231445.q8NEjY08019838@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bsam Date: Sun Sep 23 14:45:33 2012 New Revision: 304742 URL: http://svn.freebsd.org/changeset/ports/304742 Log: Changes from the PR: . fix built using Clang in C++11 mode and libc++ (-std=c++11 -stdlib=libc++); . incorporate a patch that fixes an assert bug in IceStrom; . adopt new-style options; While I'm here: . adopt new-style headers; . remove indefinite article form COMMENT; . remove library versions from LIB_DEPENDS. PR: ports/171643 Submitted by: Michael Gmelin <freebsd@grem.de> (maintainer) Added: head/devel/ice/files/patch-cpp-demo-Freeze-customEvictor-Evictor.h (contents, props changed) head/devel/ice/files/patch-cpp-include-IceUtil-Cache.h (contents, props changed) head/devel/ice/files/patch-cpp-include-IceUtil-Config.h (contents, props changed) head/devel/ice/files/patch-cpp-include-IceUtil-Shared.h (contents, props changed) head/devel/ice/files/patch-cpp-src-Freeze-MapI.h (contents, props changed) head/devel/ice/files/patch-cpp-src-Freeze-ObjectStore.cpp (contents, props changed) head/devel/ice/files/patch-cpp-src-Freeze-ObjectStore.h (contents, props changed) head/devel/ice/files/patch-cpp-src-Freeze-TransactionalEvictorContext.cpp (contents, props changed) head/devel/ice/files/patch-cpp-src-Freeze-TransactionalEvictorContext.h (contents, props changed) head/devel/ice/files/patch-cpp-src-Freeze-TransactionalEvictorI.cpp (contents, props changed) head/devel/ice/files/patch-cpp-src-IceGrid-FileCache.cpp (contents, props changed) head/devel/ice/files/patch-cpp-src-IceStorm-Replica.h (contents, props changed) head/devel/ice/files/patch-cpp-src-IceStorm-TopicI.cpp (contents, props changed) head/devel/ice/files/patch-cpp-src-IceStorm-TopicManagerI.cpp (contents, props changed) head/devel/ice/files/patch-cpp-src-IceUtil-Shared.cpp (contents, props changed) head/devel/ice/files/patch-cpp-src-slice2cpp-Main.cpp (contents, props changed) head/devel/ice/files/patch-cpp-src-slice2cs-Main.cpp (contents, props changed) head/devel/ice/files/patch-cpp-src-slice2freeze-Main.cpp (contents, props changed) head/devel/ice/files/patch-cpp-src-slice2freezej-Main.cpp (contents, props changed) head/devel/ice/files/patch-cpp-src-slice2html-Main.cpp (contents, props changed) head/devel/ice/files/patch-cpp-src-slice2java-Main.cpp (contents, props changed) head/devel/ice/files/patch-cpp-src-slice2php-Main.cpp (contents, props changed) head/devel/ice/files/patch-cpp-src-slice2py-Main.cpp (contents, props changed) head/devel/ice/files/patch-cpp-src-slice2rb-Main.cpp (contents, props changed) Modified: head/devel/ice/Makefile head/devel/ice/files/patch-cpp-include-Ice-Stream.h head/devel/ice/files/patch-cpp-src-Freeze-MapDb.cpp head/devel/ice/files/patch-cpp-src-Ice-Network.cpp Modified: head/devel/ice/Makefile ============================================================================== --- head/devel/ice/Makefile Sun Sep 23 14:04:51 2012 (r304741) +++ head/devel/ice/Makefile Sun Sep 23 14:45:33 2012 (r304742) @@ -1,97 +1,92 @@ -# New ports collection makefile for: ice -# Date created: 2004-02-02 -# Whom: Stefan Ehmann <shoesoft@gmx.net> -# +# Created by: Stefan Ehmann <shoesoft@gmx.net> # $FreeBSD$ -# -PORTNAME= Ice -PORTVERSION= 3.4.2 -PORTREVISION= 2 -CATEGORIES= devel -MASTER_SITES= http://download.zeroc.com/Ice/3.4/ - -MAINTAINER= freebsd@grem.de -COMMENT= A modern alternative to object middleware such as CORBA/COM/DCOM/COM+ - -LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ - mcpp.3:${PORTSDIR}/devel/mcpp - -OPTIONS= TESTS "Build and run tests (requires lang/python)" on \ - DEMOS "Build demos" on +PORTNAME= Ice +PORTVERSION= 3.4.2 +PORTREVISION= 3 +CATEGORIES= devel +MASTER_SITES= http://download.zeroc.com/Ice/3.4/ + +MAINTAINER= freebsd@grem.de +COMMENT= Modern alternative to object middleware such as CORBA/COM/DCOM/COM+ + +LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \ + mcpp:${PORTSDIR}/devel/mcpp + +OPTIONS_DEFINE= DEBUG DEMOS DOCS TESTS +OPTIONS_DEFAULT= DEMOS TESTS +TESTS_DESC= Build and run tests (requires lang/python) +DEMOS_DESC= Build demos .include <bsd.port.options.mk> -.if defined(WITH_TESTS) +.if ${PORT_OPTIONS:MTESTS} USE_PYTHON_BUILD= yes .endif -USE_GMAKE= yes -USE_ICONV= yes -USE_BDB= 42+ +USE_GMAKE= yes +USE_ICONV= yes +USE_BDB= 42+ INVALID_BDB_VER= 2 3 40 41 -USE_LDCONFIG= yes -BUILD_WRKSRC= ${WRKSRC}/cpp -INSTALL_WRKSRC= ${WRKSRC}/cpp - -CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include -.if defined(DEBUG) -CFLAGS+= -g -.else -CFLAGS+= -DNDEBUG +USE_LDCONFIG= yes +BUILD_WRKSRC= ${WRKSRC}/cpp +INSTALL_WRKSRC= ${WRKSRC}/cpp + +CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include +.if !${PORT_OPTIONS:MDEBUG} +CFLAGS+= -DNDEBUG .endif -.include <bsd.port.pre.mk> .if ${ARCH} == "ia64" -BROKEN= does not compile on ia64 +BROKEN= does not compile on ia64 .endif .if ${ARCH} == "sparc64" -BROKEN= fails to link +BROKEN= fails to link .endif .if ((${ARCH} != i386) && (${ARCH} != powerpc)) -MAKE_ENV= LP64=yes +MAKE_ENV= LP64=yes .endif -.if !defined(WITH_TESTS) -MAKE_ENV+= NOTESTS=yes +.if !${PORT_OPTIONS:MTESTS} +MAKE_ENV+= NOTESTS=yes .endif -.if !defined(WITH_DEMOS) -MAKE_ENV+= NODEMOS=yes +.if !${PORT_OPTIONS:MDEMOS} +MAKE_ENV+= NODEMOS=yes .endif -.if defined(NOPORTDOCS) -MAKE_ENV+= NOPORTDOCS=yes +.if !${PORT_OPTIONS:MDOCS} +MAKE_ENV+= NOPORTDOCS=yes .endif post-patch: - ${SED} 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g; \ + @${SED} 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g; \ s|%%PREFIX%%|${PREFIX}|g; \ s|%%DATADIR%%|${DATADIR}|g; \ s|%%DOCSDIR%%|${DOCSDIR}|g; \ s|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \ s|%%INSTALL_DATA%%|${INSTALL_DATA}|g' \ ${FILESDIR}/Make.rules.FreeBSD > ${WRKSRC}/cpp/config/Make.rules.FreeBSD - ${REINPLACE_CMD} 's|%%BDB_LIB_CXX_NAME%%|${BDB_LIB_CXX_NAME}|g; \ + @${REINPLACE_CMD} 's|%%BDB_LIB_CXX_NAME%%|${BDB_LIB_CXX_NAME}|g; \ s|%%BDB_LIB_DIR%%|${BDB_LIB_DIR}|g; \ s|%%BDB_INCLUDE_DIR%%|${BDB_INCLUDE_DIR}|g; \ /install_docdir/d' \ ${WRKSRC}/cpp/config/Make.rules - ${REINPLACE_CMD} '/install_configdir/d' \ + @${REINPLACE_CMD} '/install_configdir/d' \ ${WRKSRC}/cpp/config/Make.rules - ${REINPLACE_CMD} 's|INSTALL_PROGRAM|INSTALL_DATA|g' \ + @${REINPLACE_CMD} 's|INSTALL_PROGRAM|INSTALL_DATA|g' \ ${WRKSRC}/cpp/src/ca/Makefile - ${REINPLACE_CMD} '/LICENSE/s/prefix/install_slicedir/' \ + @${REINPLACE_CMD} '/LICENSE/s/prefix/install_slicedir/' \ ${WRKSRC}/config/Make.common.rules -.if defined(WITH_TESTS) -TEST_CMD= @cd ${BUILD_WRKSRC} && ${PYTHON_CMD} ./allTests.py +.if ${PORT_OPTIONS:MTESTS} +TEST_CMD= @cd ${BUILD_WRKSRC} && ${PYTHON_CMD} ./allTests.py post-build: ${TEST_CMD} regression-test test: build ${TEST_CMD} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Added: head/devel/ice/files/patch-cpp-demo-Freeze-customEvictor-Evictor.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-demo-Freeze-customEvictor-Evictor.h Sun Sep 23 14:45:33 2012 (r304742) @@ -0,0 +1,10 @@ +--- cpp.orig/demo/Freeze/customEvictor/Evictor.h 2011-06-15 21:43:58.000000000 +0200 ++++ cpp/demo/Freeze/customEvictor/Evictor.h 2012-09-10 11:43:58.000000000 +0200 +@@ -66,6 +66,7 @@ class Evictor : public Ice::ServantLocator + public: + + Evictor(CurrentDatabase&, int); ++ virtual ~Evictor() ICE_NOEXCEPT_TRUE {}; + + virtual Ice::ObjectPtr locate(const Ice::Current&, Ice::LocalObjectPtr&); + virtual void finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr&); Modified: head/devel/ice/files/patch-cpp-include-Ice-Stream.h ============================================================================== --- head/devel/ice/files/patch-cpp-include-Ice-Stream.h Sun Sep 23 14:04:51 2012 (r304741) +++ head/devel/ice/files/patch-cpp-include-Ice-Stream.h Sun Sep 23 14:45:33 2012 (r304742) @@ -77,3 +77,14 @@ } v = static_cast<T>(val); } +--- cpp.orig/include/Ice/Stream.h 2011-06-15 21:43:58.000000000 +0200 ++++ cpp/include/Ice/Stream.h 2012-09-10 11:43:58.000000000 +0200 +@@ -664,7 +664,7 @@ struct StreamWriter<StreamTraitTypeSequenceBool> + outS->writeSize(static_cast<Int>(v.size())); + for(typename T::const_iterator p = v.begin(); p != v.end(); ++p) + { +- outS->write(*p); ++ outS->write(static_cast<bool>(*p)); + } + } + }; Added: head/devel/ice/files/patch-cpp-include-IceUtil-Cache.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-include-IceUtil-Cache.h Sun Sep 23 14:45:33 2012 (r304742) @@ -0,0 +1,10 @@ +--- cpp.orig/include/IceUtil/Cache.h 2011-06-15 21:43:58.000000000 +0200 ++++ cpp/include/IceUtil/Cache.h 2012-09-10 11:43:58.000000000 +0200 +@@ -77,6 +77,6 @@ protected: + { + } + +- virtual ~Cache() ++ virtual ~Cache() ICE_NOEXCEPT_FALSE + { + } Added: head/devel/ice/files/patch-cpp-include-IceUtil-Config.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-include-IceUtil-Config.h Sun Sep 23 14:45:33 2012 (r304742) @@ -0,0 +1,19 @@ +--- cpp.orig/include/IceUtil/Config.h 2011-06-15 21:43:58.000000000 +0200 ++++ cpp/include/IceUtil/Config.h 2012-09-10 11:43:58.000000000 +0200 +@@ -248,3 +248,16 @@ public: + #define ICE_DEFAULT_MUTEX_PROTOCOL PrioNone + + #endif ++ ++ ++// ++// Macro used for declaring destructors that might throw - required for C++11 ++// ++#if __cplusplus >= 201103L ++#define ICE_DESTRUCTORS_DONT_THROW_BY_DEFAULT ++#define ICE_NOEXCEPT_FALSE noexcept(false) ++#define ICE_NOEXCEPT_TRUE noexcept(true) ++#else ++#define ICE_NOEXCEPT_FALSE ++#define ICE_NOEXCEPT_TRUE ++#endif Added: head/devel/ice/files/patch-cpp-include-IceUtil-Shared.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-include-IceUtil-Shared.h Sun Sep 23 14:45:33 2012 (r304742) @@ -0,0 +1,72 @@ +--- cpp.orig/include/IceUtil/Shared.h 2011-06-15 21:43:58.000000000 +0200 ++++ cpp/include/IceUtil/Shared.h 2012-09-10 11:43:58.000000000 +0200 +@@ -50,6 +50,11 @@ + // + // A non thread-safe base class for reference-counted types. + // ++// IceUtil::SimpleSharedUnsafeDestructor ++// ===================== ++// ++// A non thread-safe base class for reference-counted types - destructor might throw. ++// + // IceUtil::Shared + // =============== + // +@@ -109,6 +114,57 @@ private: + bool _noDelete; + }; + ++class ICE_UTIL_API SimpleSharedUnsafeDestructor ++{ ++public: ++ ++ SimpleSharedUnsafeDestructor(); ++ SimpleSharedUnsafeDestructor(const SimpleSharedUnsafeDestructor&); ++ ++ virtual ~SimpleSharedUnsafeDestructor() ICE_NOEXCEPT_FALSE ++ { ++ } ++ ++ SimpleSharedUnsafeDestructor& operator=(const SimpleSharedUnsafeDestructor&) ++ { ++ return *this; ++ } ++ ++ void __incRef() ++ { ++ assert(_ref >= 0); ++ ++_ref; ++ } ++ ++ void __decRef() ++ { ++ assert(_ref > 0); ++ if(--_ref == 0) ++ { ++ if(!_noDelete) ++ { ++ _noDelete = true; ++ delete this; ++ } ++ } ++ } ++ ++ int __getRef() const ++ { ++ return _ref; ++ } ++ ++ void __setNoDelete(bool b) ++ { ++ _noDelete = b; ++ } ++ ++private: ++ ++ int _ref; ++ bool _noDelete; ++}; ++ + class ICE_UTIL_API Shared + { + public: Modified: head/devel/ice/files/patch-cpp-src-Freeze-MapDb.cpp ============================================================================== --- head/devel/ice/files/patch-cpp-src-Freeze-MapDb.cpp Sun Sep 23 14:04:51 2012 (r304741) +++ head/devel/ice/files/patch-cpp-src-Freeze-MapDb.cpp Sun Sep 23 14:45:33 2012 (r304742) @@ -1,5 +1,19 @@ --- cpp.orig/src/Freeze/MapDb.cpp 2011-06-15 21:43:58.000000000 +0200 -+++ cpp/src/Freeze/MapDb.cpp 2012-03-04 20:14:52.000000000 +0100 ++++ cpp/src/Freeze/MapDb.cpp 2012-09-10 11:43:58.000000000 +0200 +@@ -72,7 +72,13 @@ Freeze::MapDb::~MapDb() + } + catch(const ::DbException& dx) + { ++#if defined(ICE_DESTRUCTORS_DONT_THROW_BY_DEFAULT) ++ Error out(_communicator->getLogger()); ++ out << "DbException while closing database " << _dbName << ": " ++ << dx.what(); ++#else + throw DatabaseException(__FILE__, __LINE__, dx.what()); ++#endif + } + } + } @@ -229,7 +229,11 @@ #ifndef NDEBUG bool inserted = Added: head/devel/ice/files/patch-cpp-src-Freeze-MapI.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-src-Freeze-MapI.h Sun Sep 23 14:45:33 2012 (r304742) @@ -0,0 +1,18 @@ +--- cpp.orig/src/Freeze/MapI.h 2011-06-15 21:43:58.000000000 +0200 ++++ cpp/src/Freeze/MapI.h 2012-09-10 11:43:58.000000000 +0200 +@@ -63,12 +63,13 @@ public: + void + close(); + +- class Tx : public IceUtil::SimpleShared ++ class Tx : public IceUtil::SimpleSharedUnsafeDestructor + { + public: + + Tx(const MapHelperI&); +- ~Tx(); ++ ~Tx() ICE_NOEXCEPT_FALSE; ++ ; + + void dead(); + Added: head/devel/ice/files/patch-cpp-src-Freeze-ObjectStore.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-src-Freeze-ObjectStore.cpp Sun Sep 23 14:45:33 2012 (r304742) @@ -0,0 +1,11 @@ +--- cpp.orig/src/Freeze/ObjectStore.cpp 2011-06-15 21:43:58.000000000 +0200 ++++ cpp/src/Freeze/ObjectStore.cpp 2012-09-10 11:43:58.000000000 +0200 +@@ -189,7 +189,7 @@ Freeze::ObjectStoreBase::ObjectStoreBase(const string& facet, const string& face + } + } + +-Freeze::ObjectStoreBase::~ObjectStoreBase() ++Freeze::ObjectStoreBase::~ObjectStoreBase() ICE_NOEXCEPT_FALSE + { + try + { Added: head/devel/ice/files/patch-cpp-src-Freeze-ObjectStore.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-src-Freeze-ObjectStore.h Sun Sep 23 14:45:33 2012 (r304742) @@ -0,0 +1,11 @@ +--- cpp.orig/src/Freeze/ObjectStore.h 2011-06-15 21:43:58.000000000 +0200 ++++ cpp/src/Freeze/ObjectStore.h 2012-09-10 11:43:58.000000000 +0200 +@@ -36,7 +36,7 @@ public: + ObjectStoreBase(const std::string&, const std::string&, bool, EvictorIBase*, + const std::vector<IndexPtr>&, bool); + +- virtual ~ObjectStoreBase(); ++ virtual ~ObjectStoreBase() ICE_NOEXCEPT_FALSE; + + const Ice::ObjectPtr& sampleServant() const; + Added: head/devel/ice/files/patch-cpp-src-Freeze-TransactionalEvictorContext.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-src-Freeze-TransactionalEvictorContext.cpp Sun Sep 23 14:45:33 2012 (r304742) @@ -0,0 +1,11 @@ +--- cpp.orig/src/Freeze/TransactionalEvictorContext.cpp 2011-06-15 21:43:58.000000000 +0200 ++++ cpp/src/Freeze/TransactionalEvictorContext.cpp 2012-09-10 11:43:58.000000000 +0200 +@@ -273,7 +273,7 @@ Freeze::TransactionalEvictorContext::ServantHolder::ServantHolder() : + } + + +-Freeze::TransactionalEvictorContext::ServantHolder::~ServantHolder() ++Freeze::TransactionalEvictorContext::ServantHolder::~ServantHolder() ICE_NOEXCEPT_FALSE + { + if(_ownBody && _body.ownServant) + { Added: head/devel/ice/files/patch-cpp-src-Freeze-TransactionalEvictorContext.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-src-Freeze-TransactionalEvictorContext.h Sun Sep 23 14:45:33 2012 (r304742) @@ -0,0 +1,11 @@ +--- cpp.orig/src/Freeze/TransactionalEvictorContext.h 2011-06-15 21:43:58.000000000 +0200 ++++ cpp/src/Freeze/TransactionalEvictorContext.h 2012-09-10 11:43:58.000000000 +0200 +@@ -34,7 +34,7 @@ public: + public: + + ServantHolder(); +- ~ServantHolder(); ++ ~ServantHolder() ICE_NOEXCEPT_FALSE; + + void init(const TransactionalEvictorContextPtr&, const Ice::Current&, ObjectStore<TransactionalEvictorElement>*); + Added: head/devel/ice/files/patch-cpp-src-Freeze-TransactionalEvictorI.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-src-Freeze-TransactionalEvictorI.cpp Sun Sep 23 14:45:33 2012 (r304742) @@ -0,0 +1,11 @@ +--- cpp.orig/src/Freeze/TransactionalEvictorI.cpp 2011-06-15 21:43:58.000000000 +0200 ++++ cpp/src/Freeze/TransactionalEvictorI.cpp 2012-09-10 11:43:58.000000000 +0200 +@@ -346,7 +346,7 @@ Freeze::TransactionalEvictorI::dispatch(Request& request) + { + } + +- ~CtxHolder() ++ ~CtxHolder() ICE_NOEXCEPT_FALSE + { + if(_ownCtx) + { Modified: head/devel/ice/files/patch-cpp-src-Ice-Network.cpp ============================================================================== --- head/devel/ice/files/patch-cpp-src-Ice-Network.cpp Sun Sep 23 14:04:51 2012 (r304741) +++ head/devel/ice/files/patch-cpp-src-Ice-Network.cpp Sun Sep 23 14:45:33 2012 (r304742) @@ -1,5 +1,5 @@ --- cpp.orig/src/Ice/Network.cpp 2011-06-15 21:43:58.000000000 +0200 -+++ cpp/src/Ice/Network.cpp 2011-07-15 23:40:26.000000000 +0200 ++++ cpp/src/Ice/Network.cpp 2012-09-10 11:43:58.000000000 +0200 @@ -715,7 +715,11 @@ WSASetLastError(error); #else @@ -13,3 +13,12 @@ { SocketException ex(__FILE__, __LINE__); ex.error = getSocketErrno(); +@@ -1098,7 +1098,7 @@ IceInternal::doBind(SOCKET fd, const struct sockaddr_storage& addr) + size = 0; // Keep the compiler happy. + } + +- if(bind(fd, reinterpret_cast<const struct sockaddr*>(&addr), size) == SOCKET_ERROR) ++ if(::bind(fd, reinterpret_cast<const struct sockaddr*>(&addr), size) == SOCKET_ERROR) + { + closeSocketNoThrow(fd); + SocketException ex(__FILE__, __LINE__); Added: head/devel/ice/files/patch-cpp-src-IceGrid-FileCache.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-src-IceGrid-FileCache.cpp Sun Sep 23 14:45:33 2012 (r304742) @@ -0,0 +1,20 @@ +--- cpp.orig/src/IceGrid/FileCache.cpp 2011-06-15 21:43:58.000000000 +0200 ++++ cpp/src/IceGrid/FileCache.cpp 2012-09-10 11:43:58.000000000 +0200 +@@ -195,15 +195,12 @@ FileCache::read(const string& file, Ice::Long offset, int size, Ice::Long& newOf + + totalSize += lineSize; + lines.push_back(line); +-#if defined(_MSC_VER) && (_MSC_VER < 1300) +- if(is.eof()) ++ ++ if(is.eof() || is.fail()) + { + newOffset += line.size(); + } + else +-#else +- if(!is.fail()) +-#endif + { + newOffset = is.tellg(); + } Added: head/devel/ice/files/patch-cpp-src-IceStorm-Replica.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-src-IceStorm-Replica.h Sun Sep 23 14:45:33 2012 (r304742) @@ -0,0 +1,15 @@ +--- cpp.orig/src/IceStorm/Replica.h 2011-06-15 21:43:58.000000000 +0200 ++++ cpp/src/IceStorm/Replica.h 2012-09-10 11:43:58.000000000 +0200 +@@ -23,9 +23,9 @@ struct GroupNodeInfo + GroupNodeInfo(int i, LogUpdate l, const Ice::ObjectPrx& o = Ice::ObjectPrx()); + bool operator<(const GroupNodeInfo& rhs) const; + bool operator==(const GroupNodeInfo& rhs) const; +- const int id; +- const LogUpdate llu; +- const Ice::ObjectPrx observer; ++ int id; ++ LogUpdate llu; ++ Ice::ObjectPrx observer; + }; + + class Replica : virtual public IceUtil::Shared Added: head/devel/ice/files/patch-cpp-src-IceStorm-TopicI.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-src-IceStorm-TopicI.cpp Sun Sep 23 14:45:33 2012 (r304742) @@ -0,0 +1,74 @@ +--- cpp.orig/src/IceStorm/TopicI.cpp 2011-06-15 21:43:58.000000000 +0200 ++++ cpp/src/IceStorm/TopicI.cpp 2012-09-12 22:14:00.000000000 +0200 +@@ -666,7 +666,7 @@ TopicImpl::subscribe(const QoS& origQoS, const Ice::ObjectPrx& obj) + { + try + { +- DatabaseConnectionPtr connection = _databaseCache->getConnection(); ++ DatabaseConnectionPtr connection = _databaseCache->newConnection(); + TransactionHolder txn(connection); + + SubscriberRecordKey key; +@@ -703,7 +703,7 @@ TopicImpl::subscribe(const QoS& origQoS, const Ice::ObjectPrx& obj) + { + try + { +- DatabaseConnectionPtr connection = _databaseCache->getConnection(); ++ DatabaseConnectionPtr connection = _databaseCache->newConnection(); + TransactionHolder txn(connection); + + SubscriberRecordKey key; +@@ -788,7 +788,7 @@ TopicImpl::subscribeAndGetPublisher(const QoS& qos, const Ice::ObjectPrx& obj) + { + try + { +- DatabaseConnectionPtr connection = _databaseCache->getConnection(); ++ DatabaseConnectionPtr connection = _databaseCache->newConnection(); + TransactionHolder txn(connection); + + SubscriberRecordKey key; +@@ -912,7 +912,7 @@ TopicImpl::link(const TopicPrx& topic, Ice::Int cost) + { + try + { +- DatabaseConnectionPtr connection = _databaseCache->getConnection(); ++ DatabaseConnectionPtr connection = _databaseCache->newConnection(); + TransactionHolder txn(connection); + + SubscriberRecordKey key; +@@ -1311,7 +1311,7 @@ TopicImpl::observerAddSubscriber(const LogUpdate& llu, const SubscriberRecord& r + { + try + { +- DatabaseConnectionPtr connection = _databaseCache->getConnection(); ++ DatabaseConnectionPtr connection = _databaseCache->newConnection(); + TransactionHolder txn(connection); + + SubscriberRecordKey key; +@@ -1380,7 +1380,7 @@ TopicImpl::observerRemoveSubscriber(const LogUpdate& llu, const Ice::IdentitySeq + { + try + { +- DatabaseConnectionPtr connection = _databaseCache->getConnection(); ++ DatabaseConnectionPtr connection = _databaseCache->newConnection(); + TransactionHolder txn(connection); + + for(Ice::IdentitySeq::const_iterator id = ids.begin(); id != ids.end(); ++id) +@@ -1456,7 +1456,7 @@ TopicImpl::destroyInternal(const LogUpdate& origLLU, bool master) + { + try + { +- DatabaseConnectionPtr connection = _databaseCache->getConnection(); ++ DatabaseConnectionPtr connection = _databaseCache->newConnection(); + TransactionHolder txn(connection); + + // Erase all subscriber records and the topic record. +@@ -1531,7 +1531,7 @@ TopicImpl::removeSubscribers(const Ice::IdentitySeq& ids) + { + try + { +- DatabaseConnectionPtr connection = _databaseCache->getConnection(); ++ DatabaseConnectionPtr connection = _databaseCache->newConnection(); + TransactionHolder txn(connection); + + for(Ice::IdentitySeq::const_iterator id = ids.begin(); id != ids.end(); ++id) Added: head/devel/ice/files/patch-cpp-src-IceStorm-TopicManagerI.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-src-IceStorm-TopicManagerI.cpp Sun Sep 23 14:45:33 2012 (r304742) @@ -0,0 +1,47 @@ +--- cpp.orig/src/IceStorm/TopicManagerI.cpp 2011-06-15 21:43:58.000000000 +0200 ++++ cpp/src/IceStorm/TopicManagerI.cpp 2012-09-12 22:14:00.000000000 +0200 +@@ -312,7 +312,7 @@ TopicManagerImpl::TopicManagerImpl(const InstancePtr& instance) : + _sync = _instance->nodeAdapter()->addWithUUID(_syncImpl); + } + +- DatabaseConnectionPtr connection = _databaseCache->getConnection(); ++ DatabaseConnectionPtr connection = _databaseCache->newConnection(); + + // Ensure that the llu counter is present in the log. + LLUWrapperPtr lluWrapper = _databaseCache->getLLU(connection); +@@ -381,7 +381,7 @@ TopicManagerImpl::create(const string& name) + { + try + { +- DatabaseConnectionPtr connection = _databaseCache->getConnection(); ++ DatabaseConnectionPtr connection = _databaseCache->newConnection(); + TransactionHolder txn(connection); + + SubscriberRecordKey key; +@@ -486,7 +486,7 @@ TopicManagerImpl::observerInit(const LogUpdate& llu, const TopicContentSeq& cont + { + try + { +- DatabaseConnectionPtr connection = _databaseCache->getConnection(); ++ DatabaseConnectionPtr connection = _databaseCache->newConnection(); + TransactionHolder txn(connection); + + LLUWrapperPtr lluWrapper = _databaseCache->getLLU(connection); +@@ -590,7 +590,7 @@ TopicManagerImpl::observerCreateTopic(const LogUpdate& llu, const string& name) + { + try + { +- DatabaseConnectionPtr connection = _databaseCache->getConnection(); ++ DatabaseConnectionPtr connection = _databaseCache->newConnection(); + TransactionHolder txn(connection); + + SubscriberRecordKey key; +@@ -776,7 +776,7 @@ TopicManagerImpl::initMaster(const set<GroupNodeInfo>& slaves, const LogUpdate& + { + content.clear(); + +- DatabaseConnectionPtr connection = _databaseCache->getConnection(); ++ DatabaseConnectionPtr connection = _databaseCache->newConnection(); + TransactionHolder txn(connection); + + for(map<string, TopicImplPtr>::const_iterator p = _topics.begin(); p != _topics.end(); ++p) Added: head/devel/ice/files/patch-cpp-src-IceUtil-Shared.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-src-IceUtil-Shared.cpp Sun Sep 23 14:45:33 2012 (r304742) @@ -0,0 +1,21 @@ +--- cpp.orig/src/IceUtil/Shared.cpp 2011-06-15 21:43:58.000000000 +0200 ++++ cpp/src/IceUtil/Shared.cpp 2012-09-10 11:43:58.000000000 +0200 +@@ -96,6 +96,18 @@ IceUtil::SimpleShared::SimpleShared(const SimpleShared&) : + { + } + ++IceUtil::SimpleSharedUnsafeDestructor::SimpleSharedUnsafeDestructor() : ++ _ref(0), ++ _noDelete(false) ++{ ++} ++ ++IceUtil::SimpleSharedUnsafeDestructor::SimpleSharedUnsafeDestructor(const SimpleSharedUnsafeDestructor&) : ++ _ref(0), ++ _noDelete(false) ++{ ++} ++ + IceUtil::Shared::Shared() : + _ref(0), + _noDelete(false) Added: head/devel/ice/files/patch-cpp-src-slice2cpp-Main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-src-slice2cpp-Main.cpp Sun Sep 23 14:45:33 2012 (r304742) @@ -0,0 +1,46 @@ +--- cpp.orig/src/slice2cpp/Main.cpp 2011-06-15 21:43:58.000000000 +0200 ++++ cpp/src/slice2cpp/Main.cpp 2012-09-10 11:43:58.000000000 +0200 +@@ -22,7 +22,7 @@ using namespace Slice; + namespace + { + +-IceUtil::Mutex* mutex = 0; ++IceUtil::Mutex* mtx = 0; + bool interrupted = false; + + class Init +@@ -31,13 +31,13 @@ public: + + Init() + { +- mutex = new IceUtil::Mutex; ++ mtx = new IceUtil::Mutex; + } + + ~Init() + { +- delete mutex; +- mutex = 0; ++ delete mtx; ++ mtx = 0; + } + }; + +@@ -48,7 +48,7 @@ Init init; + void + interruptedCallback(int signal) + { +- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex); ++ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx); + + interrupted = true; + } +@@ -294,7 +294,7 @@ compile(int argc, char* argv[]) + } + + { +- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex); ++ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx); + + if(interrupted) + { Added: head/devel/ice/files/patch-cpp-src-slice2cs-Main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-src-slice2cs-Main.cpp Sun Sep 23 14:45:33 2012 (r304742) @@ -0,0 +1,46 @@ +--- cpp.orig/src/slice2cs/Main.cpp 2011-06-15 21:43:58.000000000 +0200 ++++ cpp/src/slice2cs/Main.cpp 2012-09-10 11:43:58.000000000 +0200 +@@ -22,7 +22,7 @@ using namespace Slice; + namespace + { + +-IceUtil::Mutex* mutex = 0; ++IceUtil::Mutex* mtx = 0; + bool interrupted = false; + + class Init +@@ -31,13 +31,13 @@ public: + + Init() + { +- mutex = new IceUtil::Mutex; ++ mtx = new IceUtil::Mutex; + } + + ~Init() + { +- delete mutex; +- mutex = 0; ++ delete mtx; ++ mtx = 0; + } + }; + +@@ -48,7 +48,7 @@ Init init; + void + interruptedCallback(int signal) + { +- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex); ++ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx); + + interrupted = true; + } +@@ -303,7 +303,7 @@ compile(int argc, char* argv[]) + } + + { +- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex); ++ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx); + + if(interrupted) + { Added: head/devel/ice/files/patch-cpp-src-slice2freeze-Main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-src-slice2freeze-Main.cpp Sun Sep 23 14:45:33 2012 (r304742) @@ -0,0 +1,55 @@ +--- cpp.orig/src/slice2freeze/Main.cpp 2011-06-15 21:43:58.000000000 +0200 ++++ cpp/src/slice2freeze/Main.cpp 2012-09-10 11:43:58.000000000 +0200 +@@ -28,7 +28,7 @@ using namespace Slice; + namespace + { + +-IceUtil::Mutex* mutex = 0; ++IceUtil::Mutex* mtx = 0; + bool interrupted = false; + + class Init +@@ -37,13 +37,13 @@ public: + + Init() + { +- mutex = new IceUtil::Mutex; ++ mtx = new IceUtil::Mutex; + } + + ~Init() + { +- delete mutex; +- mutex = 0; ++ delete mtx; ++ mtx = 0; + } + }; + +@@ -56,7 +56,7 @@ string ICE_ENCODING_COMPARE = "Freeze::IceEncodingCompare"; + void + interruptedCallback(int signal) + { +- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex); ++ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx); + + interrupted = true; + } +@@ -1995,7 +1995,7 @@ compile(int argc, char* argv[]) + } + + { +- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex); ++ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx); + + if(interrupted) + { +@@ -2042,7 +2042,7 @@ compile(int argc, char* argv[]) + u->destroy(); + + { +- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex); ++ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx); + + if(interrupted) + { Added: head/devel/ice/files/patch-cpp-src-slice2freezej-Main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-src-slice2freezej-Main.cpp Sun Sep 23 14:45:33 2012 (r304742) @@ -0,0 +1,55 @@ +--- cpp.orig/src/slice2freezej/Main.cpp 2011-06-15 21:43:58.000000000 +0200 ++++ cpp/src/slice2freezej/Main.cpp 2012-09-10 11:43:58.000000000 +0200 +@@ -26,7 +26,7 @@ using namespace IceUtilInternal; + namespace + { + +-IceUtil::Mutex* mutex = 0; ++IceUtil::Mutex* mtx = 0; + bool interrupted = false; + + class Init +@@ -35,13 +35,13 @@ public: + + Init() + { +- mutex = new IceUtil::Mutex; ++ mtx = new IceUtil::Mutex; + } + + ~Init() + { +- delete mutex; +- mutex = 0; ++ delete mtx; ++ mtx = 0; + } + }; + +@@ -52,7 +52,7 @@ Init init; + void + interruptedCallback(int signal) + { +- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(mutex); ++ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(mtx); + + interrupted = true; + } +@@ -1828,7 +1828,7 @@ compile(int argc, char* argv[]) + } + + { +- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex); ++ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx); + + if(interrupted) + { +@@ -1923,7 +1923,7 @@ compile(int argc, char* argv[]) + u->destroy(); + + { +- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex); ++ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx); + + if(interrupted) + { Added: head/devel/ice/files/patch-cpp-src-slice2html-Main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-src-slice2html-Main.cpp Sun Sep 23 14:45:33 2012 (r304742) @@ -0,0 +1,55 @@ +--- cpp.orig/src/slice2html/Main.cpp 2011-06-15 21:43:58.000000000 +0200 ++++ cpp/src/slice2html/Main.cpp 2012-09-10 11:43:58.000000000 +0200 +@@ -24,7 +24,7 @@ using namespace IceUtil; + namespace + { + +-IceUtil::Mutex* mutex = 0; ++IceUtil::Mutex* mtx = 0; + bool interrupted = false; + + class Init +@@ -33,13 +33,13 @@ public: + + Init() + { +- mutex = new IceUtil::Mutex; ++ mtx = new IceUtil::Mutex; + } + + ~Init() + { +- delete mutex; +- mutex = 0; ++ delete mtx; ++ mtx = 0; + } + }; + +@@ -50,7 +50,7 @@ Init init; + void + interruptedCallback(int signal) + { +- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex); ++ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx); + + interrupted = true; + } +@@ -254,7 +254,7 @@ compile(int argc, char* argv[]) + } + + { +- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex); ++ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx); + + if(interrupted) + { +@@ -296,7 +296,7 @@ compile(int argc, char* argv[]) + p->destroy(); + + { +- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex); ++ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx); + + if(interrupted) + { Added: head/devel/ice/files/patch-cpp-src-slice2java-Main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-src-slice2java-Main.cpp Sun Sep 23 14:45:33 2012 (r304742) @@ -0,0 +1,46 @@ +--- cpp.orig/src/slice2java/Main.cpp 2011-06-15 21:43:58.000000000 +0200 ++++ cpp/src/slice2java/Main.cpp 2012-09-10 11:43:58.000000000 +0200 +@@ -23,7 +23,7 @@ using namespace Slice; + namespace + { + +-IceUtil::Mutex* mutex = 0; ++IceUtil::Mutex* mtx = 0; + bool interrupted = false; + + class Init +@@ -32,13 +32,13 @@ public: + + Init() + { +- mutex = new IceUtil::Mutex; ++ mtx = new IceUtil::Mutex; + } + + ~Init() + { +- delete mutex; +- mutex = 0; ++ delete mtx; ++ mtx = 0; + } + }; + +@@ -49,7 +49,7 @@ Init init; + void + interruptedCallback(int signal) + { +- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex); ++ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx); + + interrupted = true; + } +@@ -356,7 +356,7 @@ compile(int argc, char* argv[]) + } + + { +- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex); ++ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx); + + if(interrupted) + { Added: head/devel/ice/files/patch-cpp-src-slice2php-Main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-src-slice2php-Main.cpp Sun Sep 23 14:45:33 2012 (r304742) @@ -0,0 +1,46 @@ +--- cpp.orig/src/slice2php/Main.cpp 2011-06-15 21:43:58.000000000 +0200 ++++ cpp/src/slice2php/Main.cpp 2012-09-10 11:43:58.000000000 +0200 +@@ -1488,7 +1488,7 @@ printHeader(IceUtilInternal::Output& out) + namespace + { + +-IceUtil::Mutex* mutex = 0; ++IceUtil::Mutex* mtx = 0; + bool interrupted = false; + + class Init +@@ -1497,13 +1497,13 @@ public: + + Init() + { +- mutex = new IceUtil::Mutex; ++ mtx = new IceUtil::Mutex; + } + + ~Init() + { +- delete mutex; +- mutex = 0; ++ delete mtx; ++ mtx = 0; + } + }; + +@@ -1514,7 +1514,7 @@ Init init; + static void + interruptedCallback(int signal) + { +- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex); ++ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx); + + interrupted = true; + } +@@ -1777,7 +1777,7 @@ compile(int argc, char* argv[]) + } + + { +- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex); ++ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx); + + if(interrupted) + { Added: head/devel/ice/files/patch-cpp-src-slice2py-Main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-src-slice2py-Main.cpp Sun Sep 23 14:45:33 2012 (r304742) @@ -0,0 +1,46 @@ +--- cpp.orig/src/slice2py/Main.cpp 2011-06-15 21:43:58.000000000 +0200 ++++ cpp/src/slice2py/Main.cpp 2012-09-10 11:43:58.000000000 +0200 +@@ -40,7 +40,7 @@ using namespace Slice::Python; + namespace + { + +-IceUtil::Mutex* mutex = 0; ++IceUtil::Mutex* mtx = 0; + bool interrupted = false; + + class Init +@@ -49,13 +49,13 @@ public: + + Init() *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209231445.q8NEjY08019838>