Merge in trunk.

[m6w6/libmemcached] / libmemcached / callback.cc

diff --git a/libmemcached/callback.cc b/libmemcached/callback.cc
index bb13a87bc8abb52b0168ef607ae313cd8ef3fe89..84f99359d78d138e697ca80f8b84f1107fc82c4d 100644 (file)
--- a/libmemcached/callback.cc
+++ b/libmemcached/callback.cc
@@ -12,7 +12,9 @@
 #include <libmemcached/common.h>
 #include <sys/types.h>
 
+#ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#endif
 
 /*
   These functions provide data and function callback support