librados: add rados->version, include librados.h from .hpp

diff --git a/src/include/librados.h b/src/include/librados.h
index c237cadc86fcf98210cbcb34bc10d35a2b7ad81e..08d1750e97a7384c3de215d49a251ebe33d6baaa 100644 (file)
--- a/src/include/librados.h
+++ b/src/include/librados.h
@@ -23,6 +23,8 @@ extern "C" {
 
 #define LIBRADOS_VERSION_CODE LIBRADOS_VERSION(LIBRADOS_VER_MAJOR, LIBRADOS_VER_MINOR, LIBRADOS_VER_EXTRA)
 
+#define LIBRADOS_SUPPORTS_WATCH 1
+
 /* initialization */
 int rados_initialize(int argc, const char **argv); /* arguments are optional */
 void rados_deinitialize();

diff --git a/src/include/librados.hpp b/src/include/librados.hpp
index b2c04d5b1d9a2b0c530fc4d186eff6df3a7955da..476596d4426611478d33026ad0b4137a7709da26 100644 (file)
--- a/src/include/librados.hpp
+++ b/src/include/librados.hpp
@@ -8,6 +8,8 @@
 #include <vector>
 #include "buffer.h"
 
+#include "librados.h"
+
 class RadosClient;
 class Context;
 
@@ -61,6 +63,8 @@ public:
   int initialize(int argc, const char *argv[]);
   void shutdown();
 
+  void version(int *major, int *minor, int *extra);
+
   int open_pool(const char *name, pool_t *pool);
   int close_pool(pool_t pool);
   int lookup_pool(const char *name);

diff --git a/src/librados.cc b/src/librados.cc
index 7604124c03f766a764f49c069f80046cce2e32a8..bdeaa3a4789ce24dcaa70af3866e45fe0e732c1a 100644 (file)
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -1761,6 +1761,11 @@ void Rados::shutdown()
   client->shutdown();
 }
 
+void Rados::version(int *major, int *minor, int *extra)
+{
+  librados_version(major, minor, extra);
+}
+
 int Rados::list_pools(std::list<string>& v)
 {
   if (!client)