Use C++11 headers directly if in C++11 mode or when using libc++.


(joerg)

$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);

$NetBSD: patch-libcassandra_cassandra.h,v 1.1 2013/05/30 15:36:29 joerg Exp $

--- libcassandra/cassandra.h.orig	2013-05-30 10:29:32.000000000 +0000
+++ libcassandra/cassandra.h
@@ -14,7 +14,11 @@
 #include <vector>
 #include <set>
 #include <map>
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#include <memory>
+#else
 #include <tr1/memory>
+#endif
 
 #include "libgenthrift/cassandra_types.h"
 
@@ -65,17 +69,29 @@ public:
   /**
    * @return the keyspace with the given name.
    */
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+  std::shared_ptr<Keyspace> getKeyspace(const std::string &name);
+#else
   std::tr1::shared_ptr<Keyspace> getKeyspace(const std::string &name);
+#endif
 
   /**
    * @return the keyspace with the given name at the given consistency level.
    */
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+  std::shared_ptr<Keyspace> getKeyspace(const std::string &name, org::apache::cassandra::ConsistencyLevel level);
+#else
   std::tr1::shared_ptr<Keyspace> getKeyspace(const std::string &name, org::apache::cassandra::ConsistencyLevel level);
+#endif
 
   /**
    * Remove the given keyspace.
    */
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+  void removeKeyspace(std::shared_ptr<Keyspace> k);
+#else
   void removeKeyspace(std::tr1::shared_ptr<Keyspace> k);
+#endif
 
   /**
    * @return the target server cluster name.
@@ -128,7 +144,11 @@ private:
   std::string config_file;
   std::set<std::string> key_spaces;
   std::map<std::string, std::string> token_map;
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+  std::map<std::string, std::shared_ptr<Keyspace> > keyspace_map;
+#else
   std::map<std::string, std::tr1::shared_ptr<Keyspace> > keyspace_map;
+#endif
 
   Cassandra(const Cassandra&);
   Cassandra &operator=(const Cassandra&);

$NetBSD: patch-libcassandra_cassandra__factory.cc,v 1.1 2013/05/30 15:36:29 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
 CassandraFactory::~CassandraFactory() {}
 
 
-tr1::shared_ptr<Cassandra> CassandraFactory::create()
+std::shared_ptr<Cassandra> CassandraFactory::create()
 {
   /* Default is Buffered Transport */
   return create(false);
 }
 
 
-tr1::shared_ptr<Cassandra> CassandraFactory::create(bool framed_transport)
+std::shared_ptr<Cassandra> CassandraFactory::create(bool framed_transport)
 {
   CassandraClient *thrift_client= createThriftClient(host, port, framed_transport);
-  tr1::shared_ptr<Cassandra> ret(new Cassandra(thrift_client, host, port));
+  std::shared_ptr<Cassandra> ret(new Cassandra(thrift_client, host, port));
   return ret;
 }
 

$NetBSD: patch-libcassandra_cassandra__factory.h,v 1.1 2013/05/30 15:36:29 joerg Exp $

--- libcassandra/cassandra_factory.h.orig	2013-05-30 10:31:55.000000000 +0000
+++ libcassandra/cassandra_factory.h
@@ -12,7 +12,11 @@
 
 #include <string>
 #include <vector>
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#include <memory>
+#else
 #include <tr1/memory>
+#endif
 
 namespace org 
 { 
@@ -44,8 +48,13 @@ public:
   /**
    * @return a shared ptr which points to a Cassandra client
    */
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+  std::shared_ptr<Cassandra> create();
+  std::shared_ptr<Cassandra> create(bool framed_transport);
+#else
   std::tr1::shared_ptr<Cassandra> create();
   std::tr1::shared_ptr<Cassandra> create(bool framed_transport);
+#endif
 
   int getPort() const;
   const std::string &getHost() const;

$NetBSD: patch-libcassandra_keyspace__factory.cc,v 1.1 2013/05/30 15:36:29 joerg Exp $

--- libcassandra/keyspace_factory.cc.orig	2013-05-30 11:03:36.000000000 +0000
+++ libcassandra/keyspace_factory.cc
@@ -34,6 +34,16 @@ KeyspaceFactory::KeyspaceFactory() {}
 KeyspaceFactory::~KeyspaceFactory() {}
 
 
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+std::shared_ptr<Keyspace> KeyspaceFactory::create(Cassandra *client,
+                                                  const string &name,
+                                                  const map< string, map<string, string> > &descrip,
+                                                  ConsistencyLevel level)
+{
+  std::shared_ptr<Keyspace> ret(new Keyspace(client, name, descrip, level));
+  return ret;
+}
+#else
 tr1::shared_ptr<Keyspace> KeyspaceFactory::create(Cassandra *client,
                                                   const string &name,
                                                   const map< string, map<string, string> > &descrip,
@@ -42,4 +52,4 @@ tr1::shared_ptr<Keyspace> KeyspaceFactor
   tr1::shared_ptr<Keyspace> ret(new Keyspace(client, name, descrip, level));
   return ret;
 }
-
+#endif
\ No newline at end of file

$NetBSD: patch-libcassandra_keyspace__factory.h,v 1.1 2013/05/30 15:36:29 joerg Exp $

--- libcassandra/keyspace_factory.h.orig	2013-05-30 10:36:25.000000000 +0000
+++ libcassandra/keyspace_factory.h
@@ -12,7 +12,11 @@
 
 #include <string>
 #include <map>
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#include <memory>
+#else
 #include <tr1/memory>
+#endif
 
 namespace libcassandra
 {
@@ -31,10 +35,17 @@ public:
   /**
    * @return a shared ptr which points to a Keyspace class
    */
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+  std::shared_ptr<Keyspace> create(Cassandra *client,
+                                        const std::string &name,
+                                        const std::map< std::string, std::map<std::string, std::string> > &descrip,
+                                        org::apache::cassandra::ConsistencyLevel level);
+#else
   std::tr1::shared_ptr<Keyspace> create(Cassandra *client,
                                         const std::string &name,
                                         const std::map< std::string, std::map<std::string, std::string> > &descrip,
                                         org::apache::cassandra::ConsistencyLevel level);
+#endif
 
 };