Merging bzr://gaz.tangent.org/libmemcached/build/ to Build branch

[m6w6/libmemcached] / libmemcached / error.hpp

diff --git a/libmemcached/error.hpp b/libmemcached/error.hpp
index 1c683fc5d7e5d2bf155af42a53fc0a2e75b23cba..c2cdcc51c53b3744cde15261a71d5ae0a5c1fe0a 100644 (file)
--- a/libmemcached/error.hpp
+++ b/libmemcached/error.hpp
@@ -35,9 +35,9 @@
  *
  */
 
-#pragma once
+#include <libmemcached/common.h>
 
-#include <libmemcached/error.h>
+#pragma once
 
 #ifdef __cplusplus
 
@@ -45,6 +45,11 @@
 #define TOSTRING(x) STRINGIFY(x)
 #define MEMCACHED_AT __FILE__ ":" TOSTRING(__LINE__)
 
+LIBMEMCACHED_LOCAL
+memcached_return_t memcached_set_parser_error(memcached_st& memc,
+                                              const char *at,
+                                              const char *format, ...);
+
 LIBMEMCACHED_LOCAL
   memcached_return_t memcached_set_error(memcached_st&, memcached_return_t rc, const char *at);
 
@@ -82,6 +87,18 @@ LIBMEMCACHED_LOCAL
   memcached_return_t memcached_set_errno(memcached_server_st&, int local_errno, const char *at);
 
 LIBMEMCACHED_LOCAL
-bool memcached_has_current_error(memcached_st &memc);
+bool memcached_has_current_error(memcached_st&);
+
+LIBMEMCACHED_LOCAL
+bool memcached_has_current_error(memcached_server_st&);
+
+LIBMEMCACHED_LOCAL
+void memcached_error_free(memcached_st&);
+
+LIBMEMCACHED_LOCAL
+void memcached_error_free(memcached_server_st&);
+
+LIBMEMCACHED_LOCAL
+memcached_error_t *memcached_error_copy(const memcached_server_st&);
 
 #endif