cpp/openttd-patchpack/source Changeset - r12975:8de6a4ba1470

Changeset - r12975:8de6a4ba1470

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 15 years ago 2009-09-08 21:43:47
rubidium@openttd.org

(svn r17479) -Fix: silence compile warning that's only triggered when you're using a broken iconv.

1 file changed with 5 insertions and 6 deletions:

src/os/unix/unix.cpp

0 comments (0 inline, 0 general)

src/os/unix/unix.cpp

➞

Show inline comments

@@ @@ -138,25 +138,24 @@ static const char *GetLocalCode() @@
 	if (locale != NULL) locale = strchr(locale, '.');
 	return (locale == NULL) ? "" : locale + 1;
 #endif
+}
 /** FYI: This is not thread-safe.
  * convert between locales, which from and which to is set in the calling
  * functions OTTD2FS() and FS2OTTD(). You should NOT use this function directly
  * NOTE: iconv was added in OSX 10.3. 10.2.x will still have the invalid char
  * issues. There aren't any easy fix for this */
 /**
  * Convert between locales, which from and which to is set in the calling
  * functions OTTD2FS() and FS2OTTD().
  */
 static const char *convert_tofrom_fs(iconv_t convd, const char *name)
+{
 	static char buf[1024];
 	/* Work around buggy iconv implementation where inbuf is wrongly typed as
 	 * non-const. Correct implementation is at
 	 * http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.html */
 #ifdef HAVE_BROKEN_ICONV
-	char *inbuf = (char*)name;
+	char *inbuf = const_cast<char*>(name);
 #else
 	const char *inbuf = name;
 #endif
 	char *outbuf  = buf;
 	size_t outlen = sizeof(buf) - 1;

0 comments (0 inline, 0 general)