From 4b0b8315a918be5ad92d5aeb0c7df6d28966b951 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Wed, 2 Jan 2013 20:21:57 +0100
Subject: string_util: use const_cast in C++ mode

---
 src/string_util.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/string_util.h b/src/string_util.h
index 683fada1b..c1d316f0c 100644
--- a/src/string_util.h
+++ b/src/string_util.h
@@ -32,6 +32,9 @@ gcc_const
 static inline char *
 deconst_string(const char *p)
 {
+#ifdef __cplusplus
+	return const_cast<char *>(p);
+#else
 	union {
 		const char *in;
 		char *out;
@@ -40,6 +43,7 @@ deconst_string(const char *p)
 	};
 
 	return u.out;
+#endif
 }
 
 /**
-- 
cgit v1.2.3