string_util: use const_cast in C++ mode

4b0b8315 · Max Kellermann · a654f146 · 4b0b8315
Commit 4b0b8315 authored Jan 02, 2013 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

string_util.h src/string_util.h +4 -0

No files found.
--- 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
 }

 /**