Scicos gateways: rewrite sci_diffobjs to C++ 30/16530/2
Paul Bignier [Fri, 29 May 2015 11:48:04 +0000 (13:48 +0200)]
 * Tested by "scicos_blocks/tests/unit_tests/STEP_FUNCTION.tst", which crashed Scilab

Change-Id: I14bcfdeef47769d2688c05fc60bd87aa93a5bd5f

scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/includes/gw_scicos.h
scilab/modules/scicos/includes/gw_scicos.hxx
scilab/modules/scicos/sci_gateway/c/sci_diffobjs.c [deleted file]
scilab/modules/scicos/sci_gateway/cpp/sci_diffobjs.cpp [new file with mode: 0644]
scilab/modules/scicos/sci_gateway/scicos_gateway.xml
scilab/modules/scicos/src/c/cli/scicos-cli.vcxproj
scilab/modules/scicos/src/c/cli/scicos-cli.vcxproj.filters
scilab/modules/scicos/src/c/scicos.vcxproj
scilab/modules/scicos/src/c/scicos.vcxproj.filters

index 70cd31a..b0ffd4f 100644 (file)
@@ -77,6 +77,7 @@ sci_gateway/cpp/sci_ctree4.cpp \
 sci_gateway/cpp/sci_coserror.cpp \
 sci_gateway/cpp/sci_curblock.cpp \
 sci_gateway/cpp/sci_data2sig.cpp \
+sci_gateway/cpp/sci_diffobjs.cpp \
 sci_gateway/cpp/sci_duplicate.cpp \
 sci_gateway/cpp/sci_end_scicosim.cpp \
 sci_gateway/cpp/sci_getblocklabel.cpp \
@@ -99,7 +100,6 @@ sci_gateway/cpp/sci_model2blk.cpp
 
 GATEWAY_C_SOURCES = \
 sci_gateway/c/gw_scicos.c \
-sci_gateway/c/sci_diffobjs.c \
 sci_gateway/c/sci_ftree2.c \
 sci_gateway/c/sci_ftree3.c \
 sci_gateway/c/sci_ftree4.c \
index 68b397c..d0522aa 100644 (file)
@@ -295,6 +295,7 @@ am__libsciscicos_cli_la_SOURCES_DIST =  \
        sci_gateway/cpp/sci_coserror.cpp \
        sci_gateway/cpp/sci_curblock.cpp \
        sci_gateway/cpp/sci_data2sig.cpp \
+       sci_gateway/cpp/sci_diffobjs.cpp \
        sci_gateway/cpp/sci_duplicate.cpp \
        sci_gateway/cpp/sci_end_scicosim.cpp \
        sci_gateway/cpp/sci_getblocklabel.cpp \
@@ -314,10 +315,9 @@ am__libsciscicos_cli_la_SOURCES_DIST =  \
        sci_gateway/cpp/sci_vec2var.cpp \
        sci_gateway/cpp/sci_callblk.cpp \
        sci_gateway/cpp/sci_model2blk.cpp sci_gateway/c/gw_scicos.c \
-       sci_gateway/c/sci_diffobjs.c sci_gateway/c/sci_ftree2.c \
-       sci_gateway/c/sci_ftree3.c sci_gateway/c/sci_ftree4.c \
-       sci_gateway/c/sci_loadScicos.c sci_gateway/c/sci_sctree.c \
-       sci_gateway/fortran/sci_f_tree2.f \
+       sci_gateway/c/sci_ftree2.c sci_gateway/c/sci_ftree3.c \
+       sci_gateway/c/sci_ftree4.c sci_gateway/c/sci_loadScicos.c \
+       sci_gateway/c/sci_sctree.c sci_gateway/fortran/sci_f_tree2.f \
        sci_gateway/fortran/sci_f_tree3.f \
        sci_gateway/fortran/sci_f_tree4.f
 am__objects_5 =  \
@@ -331,6 +331,7 @@ am__objects_5 =  \
        sci_gateway/cpp/libsciscicos_cli_la-sci_coserror.lo \
        sci_gateway/cpp/libsciscicos_cli_la-sci_curblock.lo \
        sci_gateway/cpp/libsciscicos_cli_la-sci_data2sig.lo \
+       sci_gateway/cpp/libsciscicos_cli_la-sci_diffobjs.lo \
        sci_gateway/cpp/libsciscicos_cli_la-sci_duplicate.lo \
        sci_gateway/cpp/libsciscicos_cli_la-sci_end_scicosim.lo \
        sci_gateway/cpp/libsciscicos_cli_la-sci_getblocklabel.lo \
@@ -351,7 +352,6 @@ am__objects_5 =  \
        sci_gateway/cpp/libsciscicos_cli_la-sci_callblk.lo \
        sci_gateway/cpp/libsciscicos_cli_la-sci_model2blk.lo
 am__objects_6 = sci_gateway/c/libsciscicos_cli_la-gw_scicos.lo \
-       sci_gateway/c/libsciscicos_cli_la-sci_diffobjs.lo \
        sci_gateway/c/libsciscicos_cli_la-sci_ftree2.lo \
        sci_gateway/c/libsciscicos_cli_la-sci_ftree3.lo \
        sci_gateway/c/libsciscicos_cli_la-sci_ftree4.lo \
@@ -380,6 +380,7 @@ am__libsciscicos_la_SOURCES_DIST =  \
        sci_gateway/cpp/sci_coserror.cpp \
        sci_gateway/cpp/sci_curblock.cpp \
        sci_gateway/cpp/sci_data2sig.cpp \
+       sci_gateway/cpp/sci_diffobjs.cpp \
        sci_gateway/cpp/sci_duplicate.cpp \
        sci_gateway/cpp/sci_end_scicosim.cpp \
        sci_gateway/cpp/sci_getblocklabel.cpp \
@@ -399,10 +400,9 @@ am__libsciscicos_la_SOURCES_DIST =  \
        sci_gateway/cpp/sci_vec2var.cpp \
        sci_gateway/cpp/sci_callblk.cpp \
        sci_gateway/cpp/sci_model2blk.cpp sci_gateway/c/gw_scicos.c \
-       sci_gateway/c/sci_diffobjs.c sci_gateway/c/sci_ftree2.c \
-       sci_gateway/c/sci_ftree3.c sci_gateway/c/sci_ftree4.c \
-       sci_gateway/c/sci_loadScicos.c sci_gateway/c/sci_sctree.c \
-       sci_gateway/fortran/sci_f_tree2.f \
+       sci_gateway/c/sci_ftree2.c sci_gateway/c/sci_ftree3.c \
+       sci_gateway/c/sci_ftree4.c sci_gateway/c/sci_loadScicos.c \
+       sci_gateway/c/sci_sctree.c sci_gateway/fortran/sci_f_tree2.f \
        sci_gateway/fortran/sci_f_tree3.f \
        sci_gateway/fortran/sci_f_tree4.f
 am__objects_8 = sci_gateway/cpp/libsciscicos_la-sci_scicos_debug.lo \
@@ -415,6 +415,7 @@ am__objects_8 = sci_gateway/cpp/libsciscicos_la-sci_scicos_debug.lo \
        sci_gateway/cpp/libsciscicos_la-sci_coserror.lo \
        sci_gateway/cpp/libsciscicos_la-sci_curblock.lo \
        sci_gateway/cpp/libsciscicos_la-sci_data2sig.lo \
+       sci_gateway/cpp/libsciscicos_la-sci_diffobjs.lo \
        sci_gateway/cpp/libsciscicos_la-sci_duplicate.lo \
        sci_gateway/cpp/libsciscicos_la-sci_end_scicosim.lo \
        sci_gateway/cpp/libsciscicos_la-sci_getblocklabel.lo \
@@ -435,7 +436,6 @@ am__objects_8 = sci_gateway/cpp/libsciscicos_la-sci_scicos_debug.lo \
        sci_gateway/cpp/libsciscicos_la-sci_callblk.lo \
        sci_gateway/cpp/libsciscicos_la-sci_model2blk.lo
 am__objects_9 = sci_gateway/c/libsciscicos_la-gw_scicos.lo \
-       sci_gateway/c/libsciscicos_la-sci_diffobjs.lo \
        sci_gateway/c/libsciscicos_la-sci_ftree2.lo \
        sci_gateway/c/libsciscicos_la-sci_ftree3.lo \
        sci_gateway/c/libsciscicos_la-sci_ftree4.lo \
@@ -990,6 +990,7 @@ sci_gateway/cpp/sci_ctree4.cpp \
 sci_gateway/cpp/sci_coserror.cpp \
 sci_gateway/cpp/sci_curblock.cpp \
 sci_gateway/cpp/sci_data2sig.cpp \
+sci_gateway/cpp/sci_diffobjs.cpp \
 sci_gateway/cpp/sci_duplicate.cpp \
 sci_gateway/cpp/sci_end_scicosim.cpp \
 sci_gateway/cpp/sci_getblocklabel.cpp \
@@ -1012,7 +1013,6 @@ sci_gateway/cpp/sci_model2blk.cpp
 
 GATEWAY_C_SOURCES = \
 sci_gateway/c/gw_scicos.c \
-sci_gateway/c/sci_diffobjs.c \
 sci_gateway/c/sci_ftree2.c \
 sci_gateway/c/sci_ftree3.c \
 sci_gateway/c/sci_ftree4.c \
@@ -1603,6 +1603,9 @@ sci_gateway/cpp/libsciscicos_cli_la-sci_curblock.lo:  \
 sci_gateway/cpp/libsciscicos_cli_la-sci_data2sig.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
+sci_gateway/cpp/libsciscicos_cli_la-sci_diffobjs.lo:  \
+       sci_gateway/cpp/$(am__dirstamp) \
+       sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/cpp/libsciscicos_cli_la-sci_duplicate.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
@@ -1669,9 +1672,6 @@ sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
 sci_gateway/c/libsciscicos_cli_la-gw_scicos.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libsciscicos_cli_la-sci_diffobjs.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libsciscicos_cli_la-sci_ftree2.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -1735,6 +1735,9 @@ sci_gateway/cpp/libsciscicos_la-sci_curblock.lo:  \
 sci_gateway/cpp/libsciscicos_la-sci_data2sig.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
+sci_gateway/cpp/libsciscicos_la-sci_diffobjs.lo:  \
+       sci_gateway/cpp/$(am__dirstamp) \
+       sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/cpp/libsciscicos_la-sci_duplicate.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
@@ -1795,9 +1798,6 @@ sci_gateway/cpp/libsciscicos_la-sci_model2blk.lo:  \
 sci_gateway/c/libsciscicos_la-gw_scicos.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libsciscicos_la-sci_diffobjs.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libsciscicos_la-sci_ftree2.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -2013,14 +2013,12 @@ distclean-compile:
        -rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-gw_scicos.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_diffobjs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_ftree2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_ftree3.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_ftree4.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_loadScicos.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_sctree.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_la-gw_scicos.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_diffobjs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_ftree2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_ftree3.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_ftree4.Plo@am__quote@
@@ -2034,6 +2032,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_ctree4.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_curblock.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_data2sig.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_diffobjs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_duplicate.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_end_scicosim.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_getblocklabel.Plo@am__quote@
@@ -2063,6 +2062,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_ctree4.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_curblock.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_data2sig.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_diffobjs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_duplicate.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_end_scicosim.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_getblocklabel.Plo@am__quote@
@@ -2263,13 +2263,6 @@ sci_gateway/c/libsciscicos_cli_la-gw_scicos.lo: sci_gateway/c/gw_scicos.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciscicos_cli_la-gw_scicos.lo `test -f 'sci_gateway/c/gw_scicos.c' || echo '$(srcdir)/'`sci_gateway/c/gw_scicos.c
 
-sci_gateway/c/libsciscicos_cli_la-sci_diffobjs.lo: sci_gateway/c/sci_diffobjs.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciscicos_cli_la-sci_diffobjs.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_diffobjs.Tpo -c -o sci_gateway/c/libsciscicos_cli_la-sci_diffobjs.lo `test -f 'sci_gateway/c/sci_diffobjs.c' || echo '$(srcdir)/'`sci_gateway/c/sci_diffobjs.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_diffobjs.Tpo sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_diffobjs.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/sci_diffobjs.c' object='sci_gateway/c/libsciscicos_cli_la-sci_diffobjs.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciscicos_cli_la-sci_diffobjs.lo `test -f 'sci_gateway/c/sci_diffobjs.c' || echo '$(srcdir)/'`sci_gateway/c/sci_diffobjs.c
-
 sci_gateway/c/libsciscicos_cli_la-sci_ftree2.lo: sci_gateway/c/sci_ftree2.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciscicos_cli_la-sci_ftree2.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_ftree2.Tpo -c -o sci_gateway/c/libsciscicos_cli_la-sci_ftree2.lo `test -f 'sci_gateway/c/sci_ftree2.c' || echo '$(srcdir)/'`sci_gateway/c/sci_ftree2.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_ftree2.Tpo sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_ftree2.Plo
@@ -2312,13 +2305,6 @@ sci_gateway/c/libsciscicos_la-gw_scicos.lo: sci_gateway/c/gw_scicos.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciscicos_la-gw_scicos.lo `test -f 'sci_gateway/c/gw_scicos.c' || echo '$(srcdir)/'`sci_gateway/c/gw_scicos.c
 
-sci_gateway/c/libsciscicos_la-sci_diffobjs.lo: sci_gateway/c/sci_diffobjs.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciscicos_la-sci_diffobjs.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_diffobjs.Tpo -c -o sci_gateway/c/libsciscicos_la-sci_diffobjs.lo `test -f 'sci_gateway/c/sci_diffobjs.c' || echo '$(srcdir)/'`sci_gateway/c/sci_diffobjs.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_diffobjs.Tpo sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_diffobjs.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/sci_diffobjs.c' object='sci_gateway/c/libsciscicos_la-sci_diffobjs.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciscicos_la-sci_diffobjs.lo `test -f 'sci_gateway/c/sci_diffobjs.c' || echo '$(srcdir)/'`sci_gateway/c/sci_diffobjs.c
-
 sci_gateway/c/libsciscicos_la-sci_ftree2.lo: sci_gateway/c/sci_ftree2.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciscicos_la-sci_ftree2.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_ftree2.Tpo -c -o sci_gateway/c/libsciscicos_la-sci_ftree2.lo `test -f 'sci_gateway/c/sci_ftree2.c' || echo '$(srcdir)/'`sci_gateway/c/sci_ftree2.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_ftree2.Tpo sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_ftree2.Plo
@@ -2749,6 +2735,13 @@ sci_gateway/cpp/libsciscicos_cli_la-sci_data2sig.lo: sci_gateway/cpp/sci_data2si
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libsciscicos_cli_la-sci_data2sig.lo `test -f 'sci_gateway/cpp/sci_data2sig.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_data2sig.cpp
 
+sci_gateway/cpp/libsciscicos_cli_la-sci_diffobjs.lo: sci_gateway/cpp/sci_diffobjs.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libsciscicos_cli_la-sci_diffobjs.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_diffobjs.Tpo -c -o sci_gateway/cpp/libsciscicos_cli_la-sci_diffobjs.lo `test -f 'sci_gateway/cpp/sci_diffobjs.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_diffobjs.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_diffobjs.Tpo sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_diffobjs.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_diffobjs.cpp' object='sci_gateway/cpp/libsciscicos_cli_la-sci_diffobjs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libsciscicos_cli_la-sci_diffobjs.lo `test -f 'sci_gateway/cpp/sci_diffobjs.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_diffobjs.cpp
+
 sci_gateway/cpp/libsciscicos_cli_la-sci_duplicate.lo: sci_gateway/cpp/sci_duplicate.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libsciscicos_cli_la-sci_duplicate.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_duplicate.Tpo -c -o sci_gateway/cpp/libsciscicos_cli_la-sci_duplicate.lo `test -f 'sci_gateway/cpp/sci_duplicate.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_duplicate.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_duplicate.Tpo sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_duplicate.Plo
@@ -2952,6 +2945,13 @@ sci_gateway/cpp/libsciscicos_la-sci_data2sig.lo: sci_gateway/cpp/sci_data2sig.cp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libsciscicos_la-sci_data2sig.lo `test -f 'sci_gateway/cpp/sci_data2sig.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_data2sig.cpp
 
+sci_gateway/cpp/libsciscicos_la-sci_diffobjs.lo: sci_gateway/cpp/sci_diffobjs.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libsciscicos_la-sci_diffobjs.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_diffobjs.Tpo -c -o sci_gateway/cpp/libsciscicos_la-sci_diffobjs.lo `test -f 'sci_gateway/cpp/sci_diffobjs.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_diffobjs.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_diffobjs.Tpo sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_diffobjs.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_diffobjs.cpp' object='sci_gateway/cpp/libsciscicos_la-sci_diffobjs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libsciscicos_la-sci_diffobjs.lo `test -f 'sci_gateway/cpp/sci_diffobjs.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_diffobjs.cpp
+
 sci_gateway/cpp/libsciscicos_la-sci_duplicate.lo: sci_gateway/cpp/sci_duplicate.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libsciscicos_la-sci_duplicate.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_duplicate.Tpo -c -o sci_gateway/cpp/libsciscicos_la-sci_duplicate.lo `test -f 'sci_gateway/cpp/sci_duplicate.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_duplicate.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_duplicate.Tpo sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_duplicate.Plo
index da39126..aea335e 100644 (file)
@@ -37,8 +37,6 @@ SCICOS_IMPEXP int sci_ftree2(char *fname, void* pvApiCtx);
 SCICOS_IMPEXP int sci_ftree3(char *fname, void* pvApiCtx);
 SCICOS_IMPEXP int sci_ftree4(char *fname, void* pvApiCtx);
 
-SCICOS_IMPEXP int sci_diffobjs(char *fname, void* pvApiCtx);
-
 /* it was in a separate gateway */
 //SCICOS_IMPEXP int sci_model2blk(char *fname, void* pvApiCtx);
 //SCICOS_IMPEXP int sci_callblk(char *fname, void* pvApiCtx);
index 84af5a7..9f5db48 100644 (file)
@@ -23,6 +23,7 @@ CPP_GATEWAY_PROTOTYPE_EXPORT(sci_ctree4, SCICOS_IMPEXP);
 CPP_GATEWAY_PROTOTYPE_EXPORT(sci_coserror, SCICOS_IMPEXP);
 CPP_GATEWAY_PROTOTYPE_EXPORT(sci_curblock, SCICOS_IMPEXP);
 CPP_GATEWAY_PROTOTYPE_EXPORT(sci_data2sig, SCICOS_IMPEXP);
+CPP_GATEWAY_PROTOTYPE_EXPORT(sci_diffobjs, SCICOS_IMPEXP);
 CPP_GATEWAY_PROTOTYPE_EXPORT(sci_duplicate, SCICOS_IMPEXP);
 CPP_GATEWAY_PROTOTYPE_EXPORT(sci_end_scicosim, SCICOS_IMPEXP);
 CPP_GATEWAY_PROTOTYPE_EXPORT(sci_getblocklabel, SCICOS_IMPEXP);
diff --git a/scilab/modules/scicos/sci_gateway/c/sci_diffobjs.c b/scilab/modules/scicos/sci_gateway/c/sci_diffobjs.c
deleted file mode 100644 (file)
index 19fa969..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-/*  Scicos
-*
-*  Copyright (C) INRIA - Allan CORNET
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*
-* See the file ./license.txt
-*/
-
-/*--------------------------------------------------------------------------*/
-#include "gw_scicos.h"
-#include "stack-c.h"
-#include "sci_malloc.h"
-/*--------------------------------------------------------------------------*/
-int sci_diffobjs(char *fname, void* pvApiCtx)
-{
-#if 0
-    int one = 1, l3 = 0, k = 0;
-    int size1 = 0;
-    int size2 = 0;
-    int *header1 = NULL;
-    int *header2 = NULL;
-
-    CheckRhs(2, 2);
-    CheckLhs(1, 1);
-
-    header1 = GetData(1);
-    header2 = GetData(2);
-
-    CreateVar(3, MATRIX_OF_DOUBLE_DATATYPE, &one, &one, &l3);
-
-    LhsVar(1) = 3;
-
-    size1 = 2 * (*Lstk(Top - Rhs + 2) - *Lstk(Top - Rhs + 1));
-    size2 = 2 * (*Lstk(Top - Rhs + 3) - *Lstk(Top - Rhs + 2));
-
-    if (size1 != size2)
-    {
-        *stk(l3) = 1;
-        PutLhsVar();
-        return 0;
-    }
-
-    for (k = 0; k < size1; k++)
-    {
-        if (header1[k] != header2[k])
-        {
-            *stk(l3) = 1;
-            PutLhsVar();
-            return 0;
-        }
-        *stk(l3) = 0;
-    }
-    PutLhsVar();
-#endif
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/scicos/sci_gateway/cpp/sci_diffobjs.cpp b/scilab/modules/scicos/sci_gateway/cpp/sci_diffobjs.cpp
new file mode 100644 (file)
index 0000000..1d73e13
--- /dev/null
@@ -0,0 +1,63 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2015 - Scilab Enterprises - Paul Bignier
+ *
+ *  This file must be used under the terms of the CeCILL.
+ *  This source file is licensed as described in the file COPYING, which
+ *  you should have received as part of this distribution.  The terms
+ *  are also available at
+ *  http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
+ *
+ */
+
+#include <string>
+
+#include "gw_scicos.hxx"
+
+#include "types.hxx"
+#include "double.hxx"
+#include "function.hxx"
+
+extern "C"
+{
+#include "localization.h"
+#include "Scierror.h"
+}
+
+/*--------------------------------------------------------------------------*/
+/* Testing if two Scilab objects are equal (same types, sizes and values).
+*
+* bool = diffobjs(o1, o2)
+*
+* rhs 1 o1   : Scilab object
+* rhs 2 o2   : Scilab object
+* lhs 1 bool : double worth 0 if the objects are identical, 1 otherwise
+*/
+/*--------------------------------------------------------------------------*/
+
+static const std::string funname = "diffobjs";
+
+types::Function::ReturnValue sci_diffobjs(types::typed_list &in, int _iRetCount, types::typed_list &out)
+{
+    if (in.size() != 2)
+    {
+        Scierror(77, _("%s: Wrong number of input argument(s): %d expected.\n"), funname.data(), 2);
+        return types::Function::Error;
+    }
+
+    if (_iRetCount > 1)
+    {
+        Scierror(78, _("%s: Wrong number of output argument(s): %d expected.\n"), funname.data(), 1);
+        return types::Function::Error;
+    }
+
+    types::Double* ret = new types::Double(1);
+
+    if (*in[0] == *in[1])
+    {
+        ret->set(0, 0);
+    }
+
+    out.push_back(ret);
+    return types::Function::OK;
+}
index 3e7730e..cf4f9df 100644 (file)
@@ -23,7 +23,6 @@
     <gateway type="0" name="sci_tree2" function="sci_tree2"/>
     <gateway type="0" name="sci_tree3" function="sci_tree3"/>
     <gateway type="0" name="sci_tree4" function="sci_tree4"/>
-    <gateway type="0" name="sci_diffobjs" function="diffobjs"/>
     <gateway type="0" name="sci_model2blk" function="model2blk"/>
     <gateway type="0" name="sci_loadScicos" function="loadScicos"/>
     <!-- C++ Gateways -->
@@ -34,6 +33,7 @@
     <gateway type="1" name="sci_coserror" function="coserror"/>
     <gateway type="1" name="sci_curblock" function="curblock"/>
     <gateway type="1" name="sci_data2sig" function="data2sig"/>
+    <gateway type="1" name="sci_diffobjs" function="diffobjs"/>
     <gateway type="1" name="sci_duplicate" function="duplicate"/>
     <gateway type="1" name="sci_end_scicosim" function="end_scicosim"/>
     <gateway type="1" name="sci_getblocklabel" function="getblocklabel"/>
index fa4780e..ffe42a3 100644 (file)
@@ -262,6 +262,7 @@ lib /DEF:"$(ProjectDir)../differential_equations_f_Import.def" /SUBSYSTEM:WINDOW
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_coserror.cpp" />
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_curblock.cpp" />
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_data2sig.cpp" />
+    <ClCompile Include="..\..\..\sci_gateway\cpp\sci_diffobjs.cpp" />
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_duplicate.cpp" />
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_end_scicosim.cpp" />
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_getblocklabel.cpp" />
@@ -294,7 +295,6 @@ lib /DEF:"$(ProjectDir)../differential_equations_f_Import.def" /SUBSYSTEM:WINDOW
     <ClCompile Include="..\import.c" />
     <ClCompile Include="..\MlistGetFieldNumber.c" />
     <ClCompile Include="..\lsodar.c" />
-    <ClCompile Include="..\..\..\sci_gateway\c\sci_diffobjs.c" />
     <ClCompile Include="..\..\..\sci_gateway\c\sci_ftree2.c" />
     <ClCompile Include="..\..\..\sci_gateway\c\sci_ftree3.c" />
     <ClCompile Include="..\..\..\sci_gateway\c\sci_ftree4.c" />
@@ -386,4 +386,4 @@ lib /DEF:"$(ProjectDir)../differential_equations_f_Import.def" /SUBSYSTEM:WINDOW
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index 33e07e1..d775ae9 100644 (file)
@@ -44,9 +44,6 @@
     <ClCompile Include="..\lsodar.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\sci_gateway\c\sci_diffobjs.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\sci_gateway\c\sci_ftree2.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_data2sig.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\sci_gateway\cpp\sci_diffobjs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_duplicate.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
index 709e8ef..2ca89cc 100644 (file)
@@ -256,6 +256,7 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
     <ClCompile Include="..\..\sci_gateway\cpp\sci_ctree3.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_ctree4.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_data2sig.cpp" />
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_diffobjs.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_duplicate.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_end_scicosim.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_coserror.cpp" />
@@ -309,7 +310,6 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
     <ClCompile Include="MlistGetFieldNumber.c" />
     <ClCompile Include="lsodar.c" />
     <ClCompile Include="ddaskr.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_diffobjs.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_ftree2.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_ftree3.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_ftree4.c" />
@@ -439,4 +439,4 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index eeb8c8c..571d0a7 100644 (file)
@@ -62,9 +62,6 @@
     <ClCompile Include="ddaskr.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_diffobjs.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\sci_gateway\c\sci_ftree2.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\sci_gateway\cpp\sci_data2sig.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_diffobjs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\sci_gateway\cpp\sci_duplicate.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>