From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Fri, 7 Jan 2011 18:50:42 +0000 (-0800)
Subject: librados: add rados->version, include librados.h from .hpp
X-Git-Tag: v0.25~356
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=baae4bc7c5390681d4549bdfb9ec4204aa515eb1;p=ceph.git

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

diff --git a/src/include/librados.h b/src/include/librados.h
index c237cadc86fc..08d1750e97a7 100644
--- 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 b2c04d5b1d9a..476596d44266 100644
--- 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 7604124c03f7..bdeaa3a4789c 100644
--- 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)