From: Brian Aker <brian@tangent.org>
Date: Thu, 17 Jan 2013 19:36:54 +0000 (-0500)
Subject: Fixes that come from clang.
X-Git-Tag: 1.0.16~5^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=8ac61ad3afe5a174549645a3997aa59139f8a82b;p=m6w6%2Flibmemcached

Fixes that come from clang.
---

diff --git a/libhashkit/murmur3_api.cc b/libhashkit/murmur3_api.cc
index 137fd369..db35700b 100644
--- a/libhashkit/murmur3_api.cc
+++ b/libhashkit/murmur3_api.cc
@@ -43,7 +43,7 @@ uint32_t hashkit_murmur3(const char *key, size_t length, void *)
   const uint32_t seed= (0xdeadbeef * (uint32_t)length);
 
   uint32_t ret;
-  MurmurHash3_x86_32(key, length, seed, &ret);
+  MurmurHash3_x86_32(key, int(length), seed, &ret);
 
   return ret;
 }
diff --git a/libmemcached/csl/parser.yy b/libmemcached/csl/parser.yy
index 4fed2754..243c4fcd 100644
--- a/libmemcached/csl/parser.yy
+++ b/libmemcached/csl/parser.yy
@@ -34,6 +34,14 @@
  *
  */
 
+%{
+
+#include <libmemcached/csl/common.h>
+
+class Context;
+
+%}
+
 %error-verbose
 %debug
 %defines
@@ -51,7 +59,6 @@
 
 %{
 
-#include <libmemcached/csl/common.h>
 #include <libmemcached/options.hpp>
 
 #include <libmemcached/csl/context.h>