summaryrefslogtreecommitdiff
path: root/sql/my_json_writer.h
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2018-02-20 21:17:36 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2018-02-20 21:17:36 +0000
commit56e7b7eaede52e8d2123e909d7d42220f8c63143 (patch)
tree73e1dc4b2e53d68c3a9d5269f9140142ef08c187 /sql/my_json_writer.h
parent9d97e6010ebdeab0579a8371d01f34118c518b30 (diff)
downloadmariadb-git-56e7b7eaede52e8d2123e909d7d42220f8c63143.tar.gz
Make possible to use clang on Windows (clang-cl)
-DWITH_ASAN can be used as well now, on x64 Fix many clang-cl warnings.
Diffstat (limited to 'sql/my_json_writer.h')
-rw-r--r--sql/my_json_writer.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/my_json_writer.h b/sql/my_json_writer.h
index c4b528ae10d..3c127bd178c 100644
--- a/sql/my_json_writer.h
+++ b/sql/my_json_writer.h
@@ -173,6 +173,10 @@ public:
class Json_writer_nesting_guard
{
+#ifdef DBUG_OFF
+public:
+ Json_writer_nesting_guard(Json_writer *) {}
+#else
Json_writer* writer;
int indent_level;
public:
@@ -185,6 +189,7 @@ public:
{
DBUG_ASSERT(indent_level == writer->indent_level);
}
+#endif
};