Merge from trunk

[m6w6/libmemcached] / libmemcached / error.hpp

diff --git a/libmemcached/error.hpp b/libmemcached/error.hpp
index 1eaba13f4f739c10ed7c492fe0603f68065b7133..252101aca05e06f6db137f172ee3a832757ac18a 100644 (file)
--- a/libmemcached/error.hpp
+++ b/libmemcached/error.hpp
@@ -35,16 +35,21 @@
  *
  */
 
-#pragma once
-
 #include <libmemcached/error.h>
 
+#pragma once
+
 #ifdef __cplusplus
 
 #define STRINGIFY(x) #x
 #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);