JIMS: fix visual studio project and correct %s to %d in error message 51/12351/2
Antoine ELIAS [Tue, 27 Aug 2013 08:42:55 +0000 (10:42 +0200)]
Change-Id: I535d9508162498dd031faa8c3a61e3497c7187ad

scilab/modules/external_objects/src/cpp/ScilabObjects.cpp
scilab/modules/external_objects_java/external_objects_java.vcxproj
scilab/modules/external_objects_java/external_objects_java.vcxproj.filters

index 57725ff..b7945d3 100644 (file)
@@ -679,14 +679,23 @@ int ScilabObjects::getArgumentId(int * addr, int * tmpvars, const bool isRef, co
         default :
         {
             removeTemporaryVars(envId, tmpvars);
-            throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Unable to wrap. Unmanaged datatype ?"));
+            throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Unable to wrap. Unmanaged datatype (%d) ?"), typ);
         }
     }
 }
 
 int ScilabObjects::getMListType(int * mlist, void * pvApiCtx)
 {
-    // OK it's crappy... but it works and it is performant...
+    char * mlist_type[3];
+    char * mtype = 0;
+    int lengths[3];
+    int rows, cols;
+    int type;
+
+    if (mlist[0] == 0)
+    {
+        return EXTERNAL_VOID;
+    }
 
     if (mlist[0] != sci_mlist || mlist[1] != 3)
     {
index 17efdb7..df0ec52 100644 (file)
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>false</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>false</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
index 34df9c3..85d8c82 100644 (file)
     <ClCompile Include="sci_gateway\cpp\sci_jgetinfo.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="sci_gateway\cpp\sci_jinvoke_db.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jni\ScilabOperations.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\cpp\JavaOptionsHelper.hxx">
     <ClInclude Include="includes\gw_external_objects_java.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\jni\ScilabOperations.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file