[mapguide-commits] r10185 - in branches/4.0/MgDev/Bindings/src/Bindings/DotNet: . Foundation Geometry MapGuideCommon PlatformBase Portable Web
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Sep 8 02:43:38 PDT 2025
Author: jng
Date: 2025-09-08 02:43:37 -0700 (Mon, 08 Sep 2025)
New Revision: 10185
Modified:
branches/4.0/MgDev/Bindings/src/Bindings/DotNet/Foundation/FoundationApiGen.xml
branches/4.0/MgDev/Bindings/src/Bindings/DotNet/Geometry/GeometryApiGen.xml
branches/4.0/MgDev/Bindings/src/Bindings/DotNet/MapGuideCommon/MapGuideCommonApiGen.xml
branches/4.0/MgDev/Bindings/src/Bindings/DotNet/PlatformBase/PlatformBaseApiGen.xml
branches/4.0/MgDev/Bindings/src/Bindings/DotNet/Portable/PortableApiGen.xml
branches/4.0/MgDev/Bindings/src/Bindings/DotNet/Web/WebApiGen.xml
branches/4.0/MgDev/Bindings/src/Bindings/DotNet/dotnetcore.i
branches/4.0/MgDev/Bindings/src/Bindings/DotNet/dotnetcore_split.i
Log:
Get .net bindings working on Linux again. On Linux, use the same STRINGPARAM in typemap that we use for the Java binding and typedef STRINGPARAM to std::wstring instead of wchar_t when building the SWIG glue library on Linux
Modified: branches/4.0/MgDev/Bindings/src/Bindings/DotNet/Foundation/FoundationApiGen.xml
===================================================================
--- branches/4.0/MgDev/Bindings/src/Bindings/DotNet/Foundation/FoundationApiGen.xml 2025-09-07 04:10:01 UTC (rev 10184)
+++ branches/4.0/MgDev/Bindings/src/Bindings/DotNet/Foundation/FoundationApiGen.xml 2025-09-08 09:43:37 UTC (rev 10185)
@@ -33,8 +33,12 @@
#if defined(PHP) || defined(JAVA)
typedef std::wstring STRINGPARAM;
#else
+#if defined(_WIN32)
typedef wchar_t* STRINGPARAM;
+#else
+typedef std::wstring STRINGPARAM;
#endif
+#endif
</CppInline>
<!--
Modified: branches/4.0/MgDev/Bindings/src/Bindings/DotNet/Geometry/GeometryApiGen.xml
===================================================================
--- branches/4.0/MgDev/Bindings/src/Bindings/DotNet/Geometry/GeometryApiGen.xml 2025-09-07 04:10:01 UTC (rev 10184)
+++ branches/4.0/MgDev/Bindings/src/Bindings/DotNet/Geometry/GeometryApiGen.xml 2025-09-08 09:43:37 UTC (rev 10185)
@@ -34,8 +34,12 @@
#if defined(PHP) || defined(JAVA)
typedef std::wstring STRINGPARAM;
#else
+#if defined(_WIN32)
typedef wchar_t* STRINGPARAM;
+#else
+typedef std::wstring STRINGPARAM;
#endif
+#endif
</CppInline>
<!--
Modified: branches/4.0/MgDev/Bindings/src/Bindings/DotNet/MapGuideCommon/MapGuideCommonApiGen.xml
===================================================================
--- branches/4.0/MgDev/Bindings/src/Bindings/DotNet/MapGuideCommon/MapGuideCommonApiGen.xml 2025-09-07 04:10:01 UTC (rev 10184)
+++ branches/4.0/MgDev/Bindings/src/Bindings/DotNet/MapGuideCommon/MapGuideCommonApiGen.xml 2025-09-08 09:43:37 UTC (rev 10185)
@@ -35,8 +35,12 @@
#if defined(PHP) || defined(JAVA)
typedef std::wstring STRINGPARAM;
#else
+#if defined(_WIN32)
typedef wchar_t* STRINGPARAM;
+#else
+typedef std::wstring STRINGPARAM;
#endif
+#endif
</CppInline>
<!--
Modified: branches/4.0/MgDev/Bindings/src/Bindings/DotNet/PlatformBase/PlatformBaseApiGen.xml
===================================================================
--- branches/4.0/MgDev/Bindings/src/Bindings/DotNet/PlatformBase/PlatformBaseApiGen.xml 2025-09-07 04:10:01 UTC (rev 10184)
+++ branches/4.0/MgDev/Bindings/src/Bindings/DotNet/PlatformBase/PlatformBaseApiGen.xml 2025-09-08 09:43:37 UTC (rev 10185)
@@ -35,8 +35,12 @@
#if defined(PHP) || defined(JAVA)
typedef std::wstring STRINGPARAM;
#else
+#if defined(_WIN32)
typedef wchar_t* STRINGPARAM;
+#else
+typedef std::wstring STRINGPARAM;
#endif
+#endif
</CppInline>
<!--
Modified: branches/4.0/MgDev/Bindings/src/Bindings/DotNet/Portable/PortableApiGen.xml
===================================================================
--- branches/4.0/MgDev/Bindings/src/Bindings/DotNet/Portable/PortableApiGen.xml 2025-09-07 04:10:01 UTC (rev 10184)
+++ branches/4.0/MgDev/Bindings/src/Bindings/DotNet/Portable/PortableApiGen.xml 2025-09-08 09:43:37 UTC (rev 10185)
@@ -35,8 +35,12 @@
#if defined(PHP) || defined(JAVA)
typedef std::wstring STRINGPARAM;
#else
+#if defined(_WIN32)
typedef wchar_t* STRINGPARAM;
+#else
+typedef std::wstring STRINGPARAM;
#endif
+#endif
</CppInline>
<!--
Modified: branches/4.0/MgDev/Bindings/src/Bindings/DotNet/Web/WebApiGen.xml
===================================================================
--- branches/4.0/MgDev/Bindings/src/Bindings/DotNet/Web/WebApiGen.xml 2025-09-07 04:10:01 UTC (rev 10184)
+++ branches/4.0/MgDev/Bindings/src/Bindings/DotNet/Web/WebApiGen.xml 2025-09-08 09:43:37 UTC (rev 10185)
@@ -43,8 +43,12 @@
#if defined(PHP) || defined(JAVA)
typedef std::wstring STRINGPARAM;
#else
+#if defined(_WIN32)
typedef wchar_t* STRINGPARAM;
+#else
+typedef std::wstring STRINGPARAM;
#endif
+#endif
</CppInline>
<!--
Modified: branches/4.0/MgDev/Bindings/src/Bindings/DotNet/dotnetcore.i
===================================================================
--- branches/4.0/MgDev/Bindings/src/Bindings/DotNet/dotnetcore.i 2025-09-07 04:10:01 UTC (rev 10184)
+++ branches/4.0/MgDev/Bindings/src/Bindings/DotNet/dotnetcore.i 2025-09-08 09:43:37 UTC (rev 10185)
@@ -100,7 +100,10 @@
}
else
{
- $1 = (STRINGPARAM) X2W((XMLCh*)$input);
+ xstring u16String((XMLCh*)$input);
+ lstring u32String;
+ UnicodeString::UTF16toUTF32(u16String.c_str(),u32String);
+ $1 = STRINGPARAM((const wchar_t*) u32String.c_str());
}
}
#endif
Modified: branches/4.0/MgDev/Bindings/src/Bindings/DotNet/dotnetcore_split.i
===================================================================
--- branches/4.0/MgDev/Bindings/src/Bindings/DotNet/dotnetcore_split.i 2025-09-07 04:10:01 UTC (rev 10184)
+++ branches/4.0/MgDev/Bindings/src/Bindings/DotNet/dotnetcore_split.i 2025-09-08 09:43:37 UTC (rev 10185)
@@ -99,7 +99,10 @@
}
else
{
- $1 = (STRINGPARAM) X2W((XMLCh*)$input);
+ xstring u16String((XMLCh*)$input);
+ lstring u32String;
+ UnicodeString::UTF16toUTF32(u16String.c_str(),u32String);
+ $1 = STRINGPARAM((const wchar_t*) u32String.c_str());
}
}
#endif
More information about the mapguide-commits
mailing list