|
@@ -948,6 +948,17 @@ int main(int argc, char **argv) {
|
|
|
zoo_deterministic_conn_order(1); // enable deterministic order
|
|
|
|
|
|
#ifdef HAVE_CYRUS_SASL_H
|
|
|
+ /*
|
|
|
+ * We need to disable the deprecation warnings as Apple has
|
|
|
+ * decided to deprecate all of CyrusSASL's functions with OS 10.11
|
|
|
+ * (see MESOS-3030, ZOOKEEPER-4201). We are using GCC pragmas also
|
|
|
+ * for covering clang.
|
|
|
+ */
|
|
|
+#ifdef __APPLE__
|
|
|
+#pragma GCC diagnostic push
|
|
|
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
|
|
+#endif
|
|
|
+
|
|
|
if (mechlist) {
|
|
|
zoo_sasl_params_t sasl_params = { 0 };
|
|
|
int sr;
|
|
@@ -977,6 +988,11 @@ int main(int argc, char **argv) {
|
|
|
return errno;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+#ifdef __APPLE__
|
|
|
+#pragma GCC diagnostic pop
|
|
|
+#endif
|
|
|
+
|
|
|
#endif /* HAVE_CYRUS_SASL_H */
|
|
|
|
|
|
if (!zh) {
|