diff options
| author | joerg <joerg> | 2013-06-26 21:25:59 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2013-06-26 21:25:59 +0000 |
| commit | f606442f5eb298c697f0dc2eb759d28e1d24e360 (patch) | |
| tree | d3f2350211d803593774ea5cc0741fa5834529b7 /databases/libcassandra | |
| parent | 1853e5c8a035f1cc194c40f09ae2bb1dfb7907cf (diff) | |
| download | pkgsrc-f606442f5eb298c697f0dc2eb759d28e1d24e360.tar.gz | |
Add one missing #if for C++03 vs C++11 differences.
Diffstat (limited to 'databases/libcassandra')
| -rw-r--r-- | databases/libcassandra/distinfo | 4 | ||||
| -rw-r--r-- | databases/libcassandra/patches/patch-libcassandra_cassandra__factory.cc | 19 |
2 files changed, 16 insertions, 7 deletions
diff --git a/databases/libcassandra/distinfo b/databases/libcassandra/distinfo index 681e7dd3b15..0d203b5558f 100644 --- a/databases/libcassandra/distinfo +++ b/databases/libcassandra/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2013/05/30 15:36:29 joerg Exp $ +$NetBSD: distinfo,v 1.7 2013/06/26 21:25:59 joerg Exp $ SHA1 (libcassandra-20101010.tar.gz) = 457dcf1fd24ad310c63eefb3b532f58835f326ef RMD160 (libcassandra-20101010.tar.gz) = e3e05861d1c1173d2492d49442aa68ee429d7b8f @@ -6,7 +6,7 @@ Size (libcassandra-20101010.tar.gz) = 873233 bytes SHA1 (patch-aa) = 9cfe12f0fe26514bd7216d49e83248073cf26f4c SHA1 (patch-libcassandra_cassandra.cc) = 88d78156cbdbf51e0bd59326e72ca230de3a7688 SHA1 (patch-libcassandra_cassandra.h) = 751a4b2847e52c87bbd9ccbf05bdcd62dfbb9ae3 -SHA1 (patch-libcassandra_cassandra__factory.cc) = 7582d397c21f81f8cd5b84669204e6e2dfe93e96 +SHA1 (patch-libcassandra_cassandra__factory.cc) = fb5daea713f9b6a2df05c1dd2a2a033f49360cbe SHA1 (patch-libcassandra_cassandra__factory.h) = 602752ecd9d692bef0c692ba54098a75df4047c6 SHA1 (patch-libcassandra_keyspace__factory.cc) = 9ac440c383243fd11e13147e9375e62c48847ebc SHA1 (patch-libcassandra_keyspace__factory.h) = bd611da5e673ce38a5eb811e6196a903a5a80ff8 diff --git a/databases/libcassandra/patches/patch-libcassandra_cassandra__factory.cc b/databases/libcassandra/patches/patch-libcassandra_cassandra__factory.cc index 2be814f198f..d9fc461754b 100644 --- a/databases/libcassandra/patches/patch-libcassandra_cassandra__factory.cc +++ b/databases/libcassandra/patches/patch-libcassandra_cassandra__factory.cc @@ -1,25 +1,34 @@ -$NetBSD: patch-libcassandra_cassandra__factory.cc,v 1.1 2013/05/30 15:36:29 joerg Exp $ +$NetBSD: patch-libcassandra_cassandra__factory.cc,v 1.2 2013/06/26 21:25:59 joerg Exp $ --- libcassandra/cassandra_factory.cc.orig 2013-05-30 10:34:39.000000000 +0000 +++ libcassandra/cassandra_factory.cc -@@ -63,17 +63,17 @@ CassandraFactory::CassandraFactory(const +@@ -63,17 +63,29 @@ CassandraFactory::CassandraFactory(const CassandraFactory::~CassandraFactory() {} --tr1::shared_ptr<Cassandra> CassandraFactory::create() ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L +std::shared_ptr<Cassandra> CassandraFactory::create() ++#else + tr1::shared_ptr<Cassandra> CassandraFactory::create() ++#endif { /* Default is Buffered Transport */ return create(false); } --tr1::shared_ptr<Cassandra> CassandraFactory::create(bool framed_transport) ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L +std::shared_ptr<Cassandra> CassandraFactory::create(bool framed_transport) ++#else + tr1::shared_ptr<Cassandra> CassandraFactory::create(bool framed_transport) ++#endif { CassandraClient *thrift_client= createThriftClient(host, port, framed_transport); -- tr1::shared_ptr<Cassandra> ret(new Cassandra(thrift_client, host, port)); ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L + std::shared_ptr<Cassandra> ret(new Cassandra(thrift_client, host, port)); ++#else + tr1::shared_ptr<Cassandra> ret(new Cassandra(thrift_client, host, port)); ++#endif return ret; } |