From: Alexis Laferrière Date: Tue, 9 Jun 2015 14:57:00 +0000 (-0400) Subject: Partial Revert "compiler: Changed types of Char to uint32_t and NativeString to unsig... X-Git-Tag: v0.7.6~51^2~2 X-Git-Url: http://nitlanguage.org?ds=sidebyside Partial Revert "compiler: Changed types of Char to uint32_t and NativeString to unsigned char*" This reverts commit 6b52ea3d5ca77dbcc6edbbf71c1aa9419a019bac. Signed-off-by: Alexis Laferrière --- diff --git a/lib/cpp.nit b/lib/cpp.nit index c64ae33..a2896d3 100644 --- a/lib/cpp.nit +++ b/lib/cpp.nit @@ -31,6 +31,6 @@ end redef class NativeString # Get `self` as a `CppString` fun to_cpp_string(length: Int): CppString in "C++" `{ - return new std::string(reinterpret_cast(self), length); + return new std::string(self, length); `} end diff --git a/src/nitni/nitni_base.nit b/src/nitni/nitni_base.nit index f5cccc0..23c72d8 100644 --- a/src/nitni/nitni_base.nit +++ b/src/nitni/nitni_base.nit @@ -94,7 +94,7 @@ redef class MClassType if name == "Float" then return "double" if name == "Int" then return "long" if name == "Byte" then return "unsigned char" - if name == "NativeString" then return "unsigned char*" + if name == "NativeString" then return "char*" if mclass.kind == extern_kind then var ctype = mclass.ctype assert ctype != null @@ -110,7 +110,7 @@ redef class MClassType if name == "Float" then return "double" if name == "Int" then return "long" if name == "Byte" then return "unsigned char" - if name == "NativeString" then return "unsigned char*" + if name == "NativeString" then return "char*" if mclass.kind == extern_kind then return "void*" return super end