Merge remote-tracking branch 'origin/slint-cnes' 15/18015/1
Antoine ELIAS [Wed, 30 Mar 2016 14:43:02 +0000 (16:43 +0200)]
Change-Id: Iffdd5e66de1357c495fd1399778cc58892ccb3a6

scilab/modules/ast/src/cpp/ast/visitor_common.cpp
scilab/modules/core/includes/version.h.vc

index 864850c..76de2d4 100644 (file)
@@ -1796,6 +1796,10 @@ types::InternalType* insertionCall(const ast::Exp& e, types::typed_list* _pArgs,
         {
             pOut = _pVar->getAs<types::Struct>()->insert(_pArgs, _pInsert);
         }
+        else if (_pVar->isUserType())
+        {
+            pOut = _pVar->getAs<types::UserType>()->insert(_pArgs, _pInsert);
+        }
         else if (_pInsert->isGenericType() && (_pInsert->isTList() == false &&  _pInsert->isMList() == false))
         {
             pOut = _pVar->getAs<types::GenericType>()->remove(_pArgs);
index da355bf..f916a8f 100644 (file)
@@ -18,8 +18,8 @@
 #define SCI_VERSION_MAJOR 6
 #define SCI_VERSION_MINOR 0
 #define SCI_VERSION_MAINTENANCE 0
-#define SCI_VERSION_STRING "scilab-branch-slint-cnes"
-#define SCI_VERSION_WIDE_STRING L"scilab-branch-slint-cnes"
+#define SCI_VERSION_STRING "scilab-branch-master"
+#define SCI_VERSION_WIDE_STRING L"scilab-branch-master"
 /* SCI_VERSION_REVISION --> hash key commit */
 #define SCI_VERSION_REVISION 0
 #define SCI_VERSION_TIMESTAMP 0
@@ -29,7 +29,7 @@ void disp_scilab_version(void);
 /* for compatibility */
 /* Deprecated */
 #define SCI_VERSION SCI_VERSION_STRING
-#define DEFAULT_SCI_VERSION_MESSAGE L"scilab-branch-slint-cnes"
+#define DEFAULT_SCI_VERSION_MESSAGE L"scilab-branch-master"
 
 #endif
 /*--------------------------------------------------------------------------*/