mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-09-09 20:40:13 -04:00
58 lines
1.9 KiB
C++
58 lines
1.9 KiB
C++
$NetBSD: patch-libcassandra_cassandra.cc,v 1.1 2013/05/30 15:36:29 joerg Exp $
|
|
|
|
--- libcassandra/cassandra.cc.orig 2013-05-30 10:33:52.000000000 +0000
|
|
+++ libcassandra/cassandra.cc
|
|
@@ -17,6 +17,13 @@
|
|
#include "libcassandra/keyspace.h"
|
|
#include "libcassandra/exception.h"
|
|
|
|
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
|
|
+#include <memory>
|
|
+#else
|
|
+#include <tr1/memory>
|
|
+using std::tr1::shared_ptr;
|
|
+#endif
|
|
+
|
|
using namespace std;
|
|
using namespace org::apache::cassandra;
|
|
using namespace libcassandra;
|
|
@@ -85,17 +92,17 @@ set<string> Cassandra::getKeyspaces()
|
|
}
|
|
|
|
|
|
-tr1::shared_ptr<Keyspace> Cassandra::getKeyspace(const string &name)
|
|
+shared_ptr<Keyspace> Cassandra::getKeyspace(const string &name)
|
|
{
|
|
return getKeyspace(name, DCQUORUM);
|
|
}
|
|
|
|
|
|
-tr1::shared_ptr<Keyspace> Cassandra::getKeyspace(const string &name,
|
|
+shared_ptr<Keyspace> Cassandra::getKeyspace(const string &name,
|
|
ConsistencyLevel level)
|
|
{
|
|
string keymap_name= buildKeyspaceMapName(name, level);
|
|
- map<string, tr1::shared_ptr<Keyspace> >::iterator key_it= keyspace_map.find(keymap_name);
|
|
+ map<string, shared_ptr<Keyspace> >::iterator key_it= keyspace_map.find(keymap_name);
|
|
if (key_it == keyspace_map.end())
|
|
{
|
|
getKeyspaces();
|
|
@@ -104,7 +111,7 @@ tr1::shared_ptr<Keyspace> Cassandra::get
|
|
{
|
|
map< string, map<string, string> > keyspace_desc;
|
|
thrift_client->describe_keyspace(keyspace_desc, name);
|
|
- tr1::shared_ptr<Keyspace> ret(new Keyspace(this, name, keyspace_desc, level));
|
|
+ shared_ptr<Keyspace> ret(new Keyspace(this, name, keyspace_desc, level));
|
|
keyspace_map[keymap_name]= ret;
|
|
}
|
|
else
|
|
@@ -117,7 +124,7 @@ tr1::shared_ptr<Keyspace> Cassandra::get
|
|
}
|
|
|
|
|
|
-void Cassandra::removeKeyspace(tr1::shared_ptr<Keyspace> k)
|
|
+void Cassandra::removeKeyspace(shared_ptr<Keyspace> k)
|
|
{
|
|
string keymap_name= buildKeyspaceMapName(k->getName(), k->getConsistencyLevel());
|
|
keyspace_map.erase(keymap_name);
|