summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdeline CARNIS <adeline.carnis@scilab-enterprises.com>2016-10-28 11:57:05 +0200
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>2016-11-04 13:06:27 +0100
commite535a8f96674bce4297a8e74d4dde37eacf780fd (patch)
tree515c24aad58a675fa6eb48a8b92b6c0a6c5637df
parent5dab7cb558c16f178d20f0f20b0a2c5eeeb254bf (diff)
downloadscilab-e535a8f96674bce4297a8e74d4dde37eacf780fd.zip
scilab-e535a8f96674bce4297a8e74d4dde37eacf780fd.tar.gz
bug 14821: getio function added.
Change-Id: If276355c3b69cc9d7b932bb63567f9905bf79de7
-rw-r--r--scilab/CHANGES.md1
-rw-r--r--scilab/modules/io/Makefile.am4
-rw-r--r--scilab/modules/io/Makefile.in29
-rw-r--r--scilab/modules/io/includes/gw_io.h4
-rw-r--r--scilab/modules/io/includes/io_gw.hxx2
-rw-r--r--scilab/modules/io/sci_gateway/c/sci_getio.c46
-rw-r--r--scilab/modules/io/sci_gateway/cpp/sci_getio.cpp61
-rw-r--r--scilab/modules/io/sci_gateway/cpp/sci_lib.cpp2
-rw-r--r--scilab/modules/io/src/cpp/io_gw.cpp3
-rw-r--r--scilab/modules/io/src/cpp/io_gw.vcxproj2
-rw-r--r--scilab/modules/io/src/cpp/io_gw.vcxproj.filters6
-rw-r--r--scilab/modules/io/tests/nonreg_tests/bug_14821.dia.ref28
-rw-r--r--scilab/modules/io/tests/nonreg_tests/bug_14821.tst35
-rw-r--r--scilab/modules/output_stream/includes/DiaryModesEnum.hxx (renamed from scilab/modules/output_stream/src/cpp/DiaryModesEnum.hxx)0
-rw-r--r--scilab/modules/output_stream/includes/diary_manager.hxx (renamed from scilab/modules/output_stream/src/cpp/diary_manager.hxx)2
-rw-r--r--scilab/modules/output_stream/src/c/output_stream.vcxproj4
-rw-r--r--scilab/modules/output_stream/src/c/output_stream.vcxproj.filters12
17 files changed, 162 insertions, 79 deletions
diff --git a/scilab/CHANGES.md b/scilab/CHANGES.md
index 486a23e..745bd9c 100644
--- a/scilab/CHANGES.md
+++ b/scilab/CHANGES.md
@@ -374,6 +374,7 @@ Bug Fixes
374* [#14714](http://bugzilla.scilab.org/show_bug.cgi?id=14714): Crash/Leak when deleting datatip 374* [#14714](http://bugzilla.scilab.org/show_bug.cgi?id=14714): Crash/Leak when deleting datatip
375* [#14784](http://bugzilla.scilab.org/show_bug.cgi?id=14784): Setting field of graphics handle using children($) failed. 375* [#14784](http://bugzilla.scilab.org/show_bug.cgi?id=14784): Setting field of graphics handle using children($) failed.
376* [#14796](http://bugzilla.scilab.org/show_bug.cgi?id=14796): `ind2sub(dims, [])` returns [] in version 6. Warnings due to a `[]+1` operation have been removed. 376* [#14796](http://bugzilla.scilab.org/show_bug.cgi?id=14796): `ind2sub(dims, [])` returns [] in version 6. Warnings due to a `[]+1` operation have been removed.
377* [#14821](http://bugzilla.scilab.org/show_bug.cgi?id=14821): `getio`function has been added. An error on the diary file opened has been corrected.
377 378
378### Bugs fixed in 6.0.0 beta-2 and earlier 6.0.0 pre-releases: 379### Bugs fixed in 6.0.0 beta-2 and earlier 6.0.0 pre-releases:
379 380
diff --git a/scilab/modules/io/Makefile.am b/scilab/modules/io/Makefile.am
index 5639aef..5cacb28 100644
--- a/scilab/modules/io/Makefile.am
+++ b/scilab/modules/io/Makefile.am
@@ -18,7 +18,6 @@ IO_CPP_SOURCES = \
18 18
19GATEWAY_C_SOURCES = \ 19GATEWAY_C_SOURCES = \
20 sci_gateway/c/sci_read4b.c \ 20 sci_gateway/c/sci_read4b.c \
21 sci_gateway/c/sci_getio.c \
22 sci_gateway/c/sci_readb.c \ 21 sci_gateway/c/sci_readb.c \
23 sci_gateway/c/sci_getenv.c \ 22 sci_gateway/c/sci_getenv.c \
24 sci_gateway/c/sci_writeb.c \ 23 sci_gateway/c/sci_writeb.c \
@@ -33,7 +32,8 @@ GATEWAY_CPP_SOURCES = \
33 sci_gateway/cpp/sci_unix.cpp \ 32 sci_gateway/cpp/sci_unix.cpp \
34 sci_gateway/cpp/sci_read.cpp \ 33 sci_gateway/cpp/sci_read.cpp \
35 sci_gateway/cpp/sci_write.cpp \ 34 sci_gateway/cpp/sci_write.cpp \
36 sci_gateway/cpp/sci_lib.cpp 35 sci_gateway/cpp/sci_lib.cpp \
36 sci_gateway/cpp/sci_getio.cpp
37 37
38 38
39libsciio_la_CPPFLAGS = \ 39libsciio_la_CPPFLAGS = \
diff --git a/scilab/modules/io/Makefile.in b/scilab/modules/io/Makefile.in
index eff1c19..adefd13 100644
--- a/scilab/modules/io/Makefile.in
+++ b/scilab/modules/io/Makefile.in
@@ -193,7 +193,6 @@ am__v_lt_1 =
193@MAINTAINER_MODE_TRUE@am_libsciio_algo_la_rpath = 193@MAINTAINER_MODE_TRUE@am_libsciio_algo_la_rpath =
194libsciio_la_DEPENDENCIES = libsciio-algo.la 194libsciio_la_DEPENDENCIES = libsciio-algo.la
195am__objects_3 = sci_gateway/c/libsciio_la-sci_read4b.lo \ 195am__objects_3 = sci_gateway/c/libsciio_la-sci_read4b.lo \
196 sci_gateway/c/libsciio_la-sci_getio.lo \
197 sci_gateway/c/libsciio_la-sci_readb.lo \ 196 sci_gateway/c/libsciio_la-sci_readb.lo \
198 sci_gateway/c/libsciio_la-sci_getenv.lo \ 197 sci_gateway/c/libsciio_la-sci_getenv.lo \
199 sci_gateway/c/libsciio_la-sci_writeb.lo \ 198 sci_gateway/c/libsciio_la-sci_writeb.lo \
@@ -206,7 +205,8 @@ am__objects_4 = sci_gateway/cpp/libsciio_la-sci_genlib.lo \
206 sci_gateway/cpp/libsciio_la-sci_unix.lo \ 205 sci_gateway/cpp/libsciio_la-sci_unix.lo \
207 sci_gateway/cpp/libsciio_la-sci_read.lo \ 206 sci_gateway/cpp/libsciio_la-sci_read.lo \
208 sci_gateway/cpp/libsciio_la-sci_write.lo \ 207 sci_gateway/cpp/libsciio_la-sci_write.lo \
209 sci_gateway/cpp/libsciio_la-sci_lib.lo 208 sci_gateway/cpp/libsciio_la-sci_lib.lo \
209 sci_gateway/cpp/libsciio_la-sci_getio.lo
210am_libsciio_la_OBJECTS = $(am__objects_3) $(am__objects_4) 210am_libsciio_la_OBJECTS = $(am__objects_3) $(am__objects_4)
211libsciio_la_OBJECTS = $(am_libsciio_la_OBJECTS) 211libsciio_la_OBJECTS = $(am_libsciio_la_OBJECTS)
212@MAINTAINER_MODE_FALSE@am_libsciio_la_rpath = 212@MAINTAINER_MODE_FALSE@am_libsciio_la_rpath =
@@ -597,7 +597,6 @@ IO_CPP_SOURCES = \
597 597
598GATEWAY_C_SOURCES = \ 598GATEWAY_C_SOURCES = \
599 sci_gateway/c/sci_read4b.c \ 599 sci_gateway/c/sci_read4b.c \
600 sci_gateway/c/sci_getio.c \
601 sci_gateway/c/sci_readb.c \ 600 sci_gateway/c/sci_readb.c \
602 sci_gateway/c/sci_getenv.c \ 601 sci_gateway/c/sci_getenv.c \
603 sci_gateway/c/sci_writeb.c \ 602 sci_gateway/c/sci_writeb.c \
@@ -612,7 +611,8 @@ GATEWAY_CPP_SOURCES = \
612 sci_gateway/cpp/sci_unix.cpp \ 611 sci_gateway/cpp/sci_unix.cpp \
613 sci_gateway/cpp/sci_read.cpp \ 612 sci_gateway/cpp/sci_read.cpp \
614 sci_gateway/cpp/sci_write.cpp \ 613 sci_gateway/cpp/sci_write.cpp \
615 sci_gateway/cpp/sci_lib.cpp 614 sci_gateway/cpp/sci_lib.cpp \
615 sci_gateway/cpp/sci_getio.cpp
616 616
617libsciio_la_CPPFLAGS = \ 617libsciio_la_CPPFLAGS = \
618 -I$(srcdir)/includes/ \ 618 -I$(srcdir)/includes/ \
@@ -864,8 +864,6 @@ sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
864sci_gateway/c/libsciio_la-sci_read4b.lo: \ 864sci_gateway/c/libsciio_la-sci_read4b.lo: \
865 sci_gateway/c/$(am__dirstamp) \ 865 sci_gateway/c/$(am__dirstamp) \
866 sci_gateway/c/$(DEPDIR)/$(am__dirstamp) 866 sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
867sci_gateway/c/libsciio_la-sci_getio.lo: sci_gateway/c/$(am__dirstamp) \
868 sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
869sci_gateway/c/libsciio_la-sci_readb.lo: sci_gateway/c/$(am__dirstamp) \ 867sci_gateway/c/libsciio_la-sci_readb.lo: sci_gateway/c/$(am__dirstamp) \
870 sci_gateway/c/$(DEPDIR)/$(am__dirstamp) 868 sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
871sci_gateway/c/libsciio_la-sci_getenv.lo: \ 869sci_gateway/c/libsciio_la-sci_getenv.lo: \
@@ -910,6 +908,9 @@ sci_gateway/cpp/libsciio_la-sci_write.lo: \
910sci_gateway/cpp/libsciio_la-sci_lib.lo: \ 908sci_gateway/cpp/libsciio_la-sci_lib.lo: \
911 sci_gateway/cpp/$(am__dirstamp) \ 909 sci_gateway/cpp/$(am__dirstamp) \
912 sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp) 910 sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
911sci_gateway/cpp/libsciio_la-sci_getio.lo: \
912 sci_gateway/cpp/$(am__dirstamp) \
913 sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
913 914
914libsciio.la: $(libsciio_la_OBJECTS) $(libsciio_la_DEPENDENCIES) $(EXTRA_libsciio_la_DEPENDENCIES) 915libsciio.la: $(libsciio_la_OBJECTS) $(libsciio_la_DEPENDENCIES) $(EXTRA_libsciio_la_DEPENDENCIES)
915 $(AM_V_CXXLD)$(CXXLINK) $(am_libsciio_la_rpath) $(libsciio_la_OBJECTS) $(libsciio_la_LIBADD) $(LIBS) 916 $(AM_V_CXXLD)$(CXXLINK) $(am_libsciio_la_rpath) $(libsciio_la_OBJECTS) $(libsciio_la_LIBADD) $(LIBS)
@@ -929,7 +930,6 @@ distclean-compile:
929 -rm -f *.tab.c 930 -rm -f *.tab.c
930 931
931@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciio_la-sci_getenv.Plo@am__quote@ 932@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciio_la-sci_getenv.Plo@am__quote@
932@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciio_la-sci_getio.Plo@am__quote@
933@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciio_la-sci_getpid.Plo@am__quote@ 933@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciio_la-sci_getpid.Plo@am__quote@
934@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciio_la-sci_read4b.Plo@am__quote@ 934@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciio_la-sci_read4b.Plo@am__quote@
935@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciio_la-sci_readb.Plo@am__quote@ 935@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciio_la-sci_readb.Plo@am__quote@
@@ -938,6 +938,7 @@ distclean-compile:
938@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciio_la-sci_writeb.Plo@am__quote@ 938@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciio_la-sci_writeb.Plo@am__quote@
939@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_file.Plo@am__quote@ 939@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_file.Plo@am__quote@
940@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_genlib.Plo@am__quote@ 940@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_genlib.Plo@am__quote@
941@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_getio.Plo@am__quote@
941@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_host.Plo@am__quote@ 942@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_host.Plo@am__quote@
942@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_lib.Plo@am__quote@ 943@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_lib.Plo@am__quote@
943@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_read.Plo@am__quote@ 944@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_read.Plo@am__quote@
@@ -1018,13 +1019,6 @@ sci_gateway/c/libsciio_la-sci_read4b.lo: sci_gateway/c/sci_read4b.c
1018@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1019@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1019@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciio_la-sci_read4b.lo `test -f 'sci_gateway/c/sci_read4b.c' || echo '$(srcdir)/'`sci_gateway/c/sci_read4b.c 1020@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciio_la-sci_read4b.lo `test -f 'sci_gateway/c/sci_read4b.c' || echo '$(srcdir)/'`sci_gateway/c/sci_read4b.c
1020 1021
1021sci_gateway/c/libsciio_la-sci_getio.lo: sci_gateway/c/sci_getio.c
1022@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciio_la-sci_getio.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciio_la-sci_getio.Tpo -c -o sci_gateway/c/libsciio_la-sci_getio.lo `test -f 'sci_gateway/c/sci_getio.c' || echo '$(srcdir)/'`sci_gateway/c/sci_getio.c
1023@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciio_la-sci_getio.Tpo sci_gateway/c/$(DEPDIR)/libsciio_la-sci_getio.Plo
1024@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sci_gateway/c/sci_getio.c' object='sci_gateway/c/libsciio_la-sci_getio.lo' libtool=yes @AMDEPBACKSLASH@
1025@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1026@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciio_la-sci_getio.lo `test -f 'sci_gateway/c/sci_getio.c' || echo '$(srcdir)/'`sci_gateway/c/sci_getio.c
1027
1028sci_gateway/c/libsciio_la-sci_readb.lo: sci_gateway/c/sci_readb.c 1022sci_gateway/c/libsciio_la-sci_readb.lo: sci_gateway/c/sci_readb.c
1029@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciio_la-sci_readb.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciio_la-sci_readb.Tpo -c -o sci_gateway/c/libsciio_la-sci_readb.lo `test -f 'sci_gateway/c/sci_readb.c' || echo '$(srcdir)/'`sci_gateway/c/sci_readb.c 1023@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciio_la-sci_readb.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciio_la-sci_readb.Tpo -c -o sci_gateway/c/libsciio_la-sci_readb.lo `test -f 'sci_gateway/c/sci_readb.c' || echo '$(srcdir)/'`sci_gateway/c/sci_readb.c
1030@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciio_la-sci_readb.Tpo sci_gateway/c/$(DEPDIR)/libsciio_la-sci_readb.Plo 1024@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciio_la-sci_readb.Tpo sci_gateway/c/$(DEPDIR)/libsciio_la-sci_readb.Plo
@@ -1161,6 +1155,13 @@ sci_gateway/cpp/libsciio_la-sci_lib.lo: sci_gateway/cpp/sci_lib.cpp
1161@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1155@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1162@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libsciio_la-sci_lib.lo `test -f 'sci_gateway/cpp/sci_lib.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_lib.cpp 1156@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libsciio_la-sci_lib.lo `test -f 'sci_gateway/cpp/sci_lib.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_lib.cpp
1163 1157
1158sci_gateway/cpp/libsciio_la-sci_getio.lo: sci_gateway/cpp/sci_getio.cpp
1159@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libsciio_la-sci_getio.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_getio.Tpo -c -o sci_gateway/cpp/libsciio_la-sci_getio.lo `test -f 'sci_gateway/cpp/sci_getio.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_getio.cpp
1160@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_getio.Tpo sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_getio.Plo
1161@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sci_gateway/cpp/sci_getio.cpp' object='sci_gateway/cpp/libsciio_la-sci_getio.lo' libtool=yes @AMDEPBACKSLASH@
1162@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1163@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libsciio_la-sci_getio.lo `test -f 'sci_gateway/cpp/sci_getio.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_getio.cpp
1164
1164mostlyclean-libtool: 1165mostlyclean-libtool:
1165 -rm -f *.lo 1166 -rm -f *.lo
1166 1167
diff --git a/scilab/modules/io/includes/gw_io.h b/scilab/modules/io/includes/gw_io.h
index ec528a3..ca75129 100644
--- a/scilab/modules/io/includes/gw_io.h
+++ b/scilab/modules/io/includes/gw_io.h
@@ -18,6 +18,8 @@
18/*--------------------------------------------------------------------------*/ 18/*--------------------------------------------------------------------------*/
19#include "machine.h" 19#include "machine.h"
20#include "dynlib_io.h" 20#include "dynlib_io.h"
21#include "c_gateway_prototype.h"
22
21/*--------------------------------------------------------------------------*/ 23/*--------------------------------------------------------------------------*/
22IO_IMPEXP int gw_io(void); 24IO_IMPEXP int gw_io(void);
23/*--------------------------------------------------------------------------*/ 25/*--------------------------------------------------------------------------*/
@@ -36,7 +38,7 @@ int sci_read4b(char *fname, unsigned long fname_len);
36int sci_write4b(char *fname, unsigned long fname_len); 38int sci_write4b(char *fname, unsigned long fname_len);
37int sci_save(char *fname, void *pvApiCtx); 39int sci_save(char *fname, void *pvApiCtx);
38int sci_percent_load(char *fname, unsigned long fname_len); 40int sci_percent_load(char *fname, unsigned long fname_len);
39int sci_getio(char *fname, unsigned long fname_len); 41C_GATEWAY_PROTOTYPE(sci_getio);
40/*--------------------------------------------------------------------------*/ 42/*--------------------------------------------------------------------------*/
41#endif /* __GW_IO_H__ */ 43#endif /* __GW_IO_H__ */
42/*--------------------------------------------------------------------------*/ 44/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/io/includes/io_gw.hxx b/scilab/modules/io/includes/io_gw.hxx
index 5d58a14..691e86f 100644
--- a/scilab/modules/io/includes/io_gw.hxx
+++ b/scilab/modules/io/includes/io_gw.hxx
@@ -42,6 +42,6 @@ CPP_GATEWAY_PROTOTYPE(sci_genlib);
42CPP_GATEWAY_PROTOTYPE(sci_file); 42CPP_GATEWAY_PROTOTYPE(sci_file);
43CPP_GATEWAY_PROTOTYPE(sci_host); 43CPP_GATEWAY_PROTOTYPE(sci_host);
44CPP_GATEWAY_PROTOTYPE(sci_unix); 44CPP_GATEWAY_PROTOTYPE(sci_unix);
45CPP_GATEWAY_PROTOTYPE(sci_lib); 45CPP_GATEWAY_PROTOTYPE(sci_gwlib);
46CPP_GATEWAY_PROTOTYPE(sci_write); 46CPP_GATEWAY_PROTOTYPE(sci_write);
47CPP_GATEWAY_PROTOTYPE(sci_read); 47CPP_GATEWAY_PROTOTYPE(sci_read);
diff --git a/scilab/modules/io/sci_gateway/c/sci_getio.c b/scilab/modules/io/sci_gateway/c/sci_getio.c
deleted file mode 100644
index 28d4e6a..0000000
--- a/scilab/modules/io/sci_gateway/c/sci_getio.c
+++ /dev/null
@@ -1,46 +0,0 @@
1/*
2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3 * Copyright (C) 2007 - INRIA - Allan CORNET
4 *
5 * Copyright (C) 2012 - 2016 - Scilab Enterprises
6 *
7 * This file is hereby licensed under the terms of the GNU GPL v2.0,
8 * pursuant to article 5.3.4 of the CeCILL v.2.1.
9 * This file was originally licensed under the terms of the CeCILL v2.1,
10 * and continues to be available under such terms.
11 * For more information, see the COPYING file which you should have received
12 * along with this program.
13 *
14 */
15
16#include "gw_io.h"
17#include "sci_malloc.h"
18/*--------------------------------------------------------------------------*/
19int sci_getio(char *fname, unsigned long fname_len)
20{
21 //int one = 1;
22 //int four = 4;
23 //int *values = NULL;
24
25 //CheckRhs(0, 0);
26 //CheckLhs(0, 1);
27
28 //values = (int*)MALLOC(sizeof(int) * (one * four));
29
30 //values[0] = C2F(iop).rio;
31 //values[1] = C2F(iop).rte;
32 //values[2] = 0;
33 //values[3] = C2F(iop).wte;
34
35 //CreateVarFromPtr(Rhs + 1, MATRIX_OF_INTEGER_DATATYPE, &one, &four, &values);
36 //LhsVar(1) = Rhs + 1;
37 //if (values)
38 //{
39 // FREE(values);
40 // values = NULL;
41 //}
42 //PutLhsVar();
43
44 return 0;
45}
46/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/io/sci_gateway/cpp/sci_getio.cpp b/scilab/modules/io/sci_gateway/cpp/sci_getio.cpp
new file mode 100644
index 0000000..5bbb066
--- /dev/null
+++ b/scilab/modules/io/sci_gateway/cpp/sci_getio.cpp
@@ -0,0 +1,61 @@
1/*
2* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3* Copyright (C) 2007 - INRIA - Allan CORNET
4* Copyright (C) 2016 - Scilab Enterprises - Adeline CARNIS
5*
6* Copyright (C) 2012 - 2016 - Scilab Enterprises
7*
8* This file is hereby licensed under the terms of the GNU GPL v2.0,
9* pursuant to article 5.3.4 of the CeCILL v.2.1.
10* This file was originally licensed under the terms of the CeCILL v2.1,
11* and continues to be available under such terms.
12* For more information, see the COPYING file which you should have received
13* along with this program.
14*
15*/
16/*--------------------------------------------------------------------------*/
17#include "diary_manager.hxx"
18#include <vector>
19
20extern "C"
21{
22#include "gw_io.h"
23#include "api_scilab.h"
24#include "Scierror.h"
25#include "localization.h"
26#include "gw_output_stream.h"
27}
28
29static const char fname[] = "getio";
30/*--------------------------------------------------------------------------*/
31int sci_getio(scilabEnv env, int nin, scilabVar* in, int nopt, scilabOpt opt, int nout, scilabVar* out)
32{
33
34 if (nin != 0)
35 {
36 Scierror(77, _("%s: Wrong number of input argument(s): %d expected.\n"), fname, 0);
37 return 1;
38 }
39
40 if (nout != 1)
41 {
42 Scierror(78, _("%s: Wrong number of output argument(s): %d expected.\n"), fname, 1);
43 return 1;
44 }
45
46 //get diarys count
47 int diary = 0;
48 int* diarys = getDiaryIDs(&diary);
49 //don't care about ids
50 delete[] diarys;
51
52 //create data values array
53 std::vector<double> val = {5, 5, (double)diary, 6};
54 //create output matrix
55 scilabVar var = scilab_createDoubleMatrix2d(env, 1, 4, 0);
56 //fill it
57 scilab_setDoubleArray(env, var, val.data());
58 //return it to scilab
59 out[0] = var;
60 return 0;
61} \ No newline at end of file
diff --git a/scilab/modules/io/sci_gateway/cpp/sci_lib.cpp b/scilab/modules/io/sci_gateway/cpp/sci_lib.cpp
index 3282383..dd08cde 100644
--- a/scilab/modules/io/sci_gateway/cpp/sci_lib.cpp
+++ b/scilab/modules/io/sci_gateway/cpp/sci_lib.cpp
@@ -28,7 +28,7 @@ extern "C"
28} 28}
29 29
30/*--------------------------------------------------------------------------*/ 30/*--------------------------------------------------------------------------*/
31types::Function::ReturnValue sci_lib(types::typed_list &in, int /*_iRetCount*/, types::typed_list &out) 31types::Function::ReturnValue sci_gwlib(types::typed_list &in, int /*_iRetCount*/, types::typed_list &out)
32{ 32{
33 if (in.size() != 1) 33 if (in.size() != 1)
34 { 34 {
diff --git a/scilab/modules/io/src/cpp/io_gw.cpp b/scilab/modules/io/src/cpp/io_gw.cpp
index c149f7d..7526289 100644
--- a/scilab/modules/io/src/cpp/io_gw.cpp
+++ b/scilab/modules/io/src/cpp/io_gw.cpp
@@ -30,8 +30,9 @@ int IoModule::Load()
30 symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"unix", &sci_unix, MODULE_NAME)); 30 symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"unix", &sci_unix, MODULE_NAME));
31 symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"getenv", &sci_getenv, MODULE_NAME)); 31 symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"getenv", &sci_getenv, MODULE_NAME));
32 symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"setenv", &sci_setenv, MODULE_NAME)); 32 symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"setenv", &sci_setenv, MODULE_NAME));
33 symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"lib", &sci_lib, MODULE_NAME)); 33 symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"lib", &sci_gwlib, MODULE_NAME));
34 symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"write", &sci_write, MODULE_NAME)); 34 symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"write", &sci_write, MODULE_NAME));
35 symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"read", &sci_read, MODULE_NAME)); 35 symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"read", &sci_read, MODULE_NAME));
36 symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"getio", &sci_getio, MODULE_NAME));
36 return 1; 37 return 1;
37} 38}
diff --git a/scilab/modules/io/src/cpp/io_gw.vcxproj b/scilab/modules/io/src/cpp/io_gw.vcxproj
index 4a1c691..697aa96 100644
--- a/scilab/modules/io/src/cpp/io_gw.vcxproj
+++ b/scilab/modules/io/src/cpp/io_gw.vcxproj
@@ -194,11 +194,11 @@
194 </PreLinkEvent> 194 </PreLinkEvent>
195 </ItemDefinitionGroup> 195 </ItemDefinitionGroup>
196 <ItemGroup> 196 <ItemGroup>
197 <ClCompile Include="..\..\sci_gateway\cpp\sci_getio.cpp" />
197 <ClCompile Include="..\..\sci_gateway\cpp\sci_lib.cpp" /> 198 <ClCompile Include="..\..\sci_gateway\cpp\sci_lib.cpp" />
198 <ClCompile Include="..\..\sci_gateway\cpp\sci_read.cpp" /> 199 <ClCompile Include="..\..\sci_gateway\cpp\sci_read.cpp" />
199 <ClCompile Include="..\..\sci_gateway\cpp\sci_write.cpp" /> 200 <ClCompile Include="..\..\sci_gateway\cpp\sci_write.cpp" />
200 <ClCompile Include="..\..\sci_gateway\c\sci_getenv.c" /> 201 <ClCompile Include="..\..\sci_gateway\c\sci_getenv.c" />
201 <ClCompile Include="..\..\sci_gateway\c\sci_getio.c" />
202 <ClCompile Include="..\..\sci_gateway\c\sci_getpid.c" /> 202 <ClCompile Include="..\..\sci_gateway\c\sci_getpid.c" />
203 <ClCompile Include="..\..\sci_gateway\c\sci_read4b.c" /> 203 <ClCompile Include="..\..\sci_gateway\c\sci_read4b.c" />
204 <ClCompile Include="..\..\sci_gateway\c\sci_readb.c" /> 204 <ClCompile Include="..\..\sci_gateway\c\sci_readb.c" />
diff --git a/scilab/modules/io/src/cpp/io_gw.vcxproj.filters b/scilab/modules/io/src/cpp/io_gw.vcxproj.filters
index cbe18df..c461da9 100644
--- a/scilab/modules/io/src/cpp/io_gw.vcxproj.filters
+++ b/scilab/modules/io/src/cpp/io_gw.vcxproj.filters
@@ -39,9 +39,6 @@
39 <ClCompile Include="..\..\sci_gateway\c\sci_writeb.c"> 39 <ClCompile Include="..\..\sci_gateway\c\sci_writeb.c">
40 <Filter>Source Files</Filter> 40 <Filter>Source Files</Filter>
41 </ClCompile> 41 </ClCompile>
42 <ClCompile Include="..\..\sci_gateway\c\sci_getio.c">
43 <Filter>Source Files</Filter>
44 </ClCompile>
45 <ClCompile Include="..\..\sci_gateway\c\sci_getpid.c"> 42 <ClCompile Include="..\..\sci_gateway\c\sci_getpid.c">
46 <Filter>Source Files</Filter> 43 <Filter>Source Files</Filter>
47 </ClCompile> 44 </ClCompile>
@@ -69,6 +66,9 @@
69 <ClCompile Include="readwrite.cpp"> 66 <ClCompile Include="readwrite.cpp">
70 <Filter>Source Files</Filter> 67 <Filter>Source Files</Filter>
71 </ClCompile> 68 </ClCompile>
69 <ClCompile Include="..\..\sci_gateway\cpp\sci_getio.cpp">
70 <Filter>Source Files</Filter>
71 </ClCompile>
72 </ItemGroup> 72 </ItemGroup>
73 <ItemGroup> 73 <ItemGroup>
74 <ClInclude Include="..\..\includes\dynlib_io_gw.h"> 74 <ClInclude Include="..\..\includes\dynlib_io_gw.h">
diff --git a/scilab/modules/io/tests/nonreg_tests/bug_14821.dia.ref b/scilab/modules/io/tests/nonreg_tests/bug_14821.dia.ref
new file mode 100644
index 0000000..2f4fa33
--- /dev/null
+++ b/scilab/modules/io/tests/nonreg_tests/bug_14821.dia.ref
@@ -0,0 +1,28 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2016 - Scilab Enterprises - Adeline CARNIS
4//
5// This file is distributed under the same license as the Scilab package.
6// =============================================================================
7// <-- Non-regression test for bug 14821 -->
8//
9// <-- Bugzilla URL -->
10// http://bugzilla.scilab.org/14821
11//
12// <-- Short Description -->
13// getio function has been added.
14// WARNING: a diary file opened with test_run !
15res = getio();
16assert_checkequal(res, [5 5 1 6]);
17a = diary(fullfile("TMPDIR", "diary.txt"));
18res = getio();
19assert_checkequal(res, [5 5 2 6]);
20// error
21str = "getio(1)";
22assert_checkfalse(execstr(str ,"errcatch") == 0);
23refMsg = msprintf(_("%s: Wrong number of input argument(s): %d expected.\n"), "getio", 0);
24assert_checkerror(str, refMsg);
25str = "[a,b] = getio()";
26assert_checkfalse(execstr(str ,"errcatch") == 0);
27refMsg = msprintf(_("%s: Wrong number of output argument(s): %d expected.\n"), "getio", 1);
28assert_checkerror(str, refMsg);
diff --git a/scilab/modules/io/tests/nonreg_tests/bug_14821.tst b/scilab/modules/io/tests/nonreg_tests/bug_14821.tst
new file mode 100644
index 0000000..be2a77d
--- /dev/null
+++ b/scilab/modules/io/tests/nonreg_tests/bug_14821.tst
@@ -0,0 +1,35 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2016 - Scilab Enterprises - Adeline CARNIS
4//
5// This file is distributed under the same license as the Scilab package.
6// =============================================================================
7
8// <-- Non-regression test for bug 14821 -->
9//
10// <-- Bugzilla URL -->
11// http://bugzilla.scilab.org/14821
12//
13// <-- Short Description -->
14// getio function has been added.
15
16// WARNING: a diary file opened with test_run !
17res = getio();
18assert_checkequal(res, [5 5 1 6]);
19
20a = diary(fullfile("TMPDIR", "diary.txt"));
21res = getio();
22assert_checkequal(res, [5 5 2 6]);
23
24// error
25str = "getio(1)";
26assert_checkfalse(execstr(str ,"errcatch") == 0);
27refMsg = msprintf(_("%s: Wrong number of input argument(s): %d expected.\n"), "getio", 0);
28assert_checkerror(str, refMsg);
29
30str = "[a,b] = getio()";
31assert_checkfalse(execstr(str ,"errcatch") == 0);
32refMsg = msprintf(_("%s: Wrong number of output argument(s): %d expected.\n"), "getio", 1);
33assert_checkerror(str, refMsg);
34
35
diff --git a/scilab/modules/output_stream/src/cpp/DiaryModesEnum.hxx b/scilab/modules/output_stream/includes/DiaryModesEnum.hxx
index 44ade4a..44ade4a 100644
--- a/scilab/modules/output_stream/src/cpp/DiaryModesEnum.hxx
+++ b/scilab/modules/output_stream/includes/DiaryModesEnum.hxx
diff --git a/scilab/modules/output_stream/src/cpp/diary_manager.hxx b/scilab/modules/output_stream/includes/diary_manager.hxx
index 559488b..a09c70e 100644
--- a/scilab/modules/output_stream/src/cpp/diary_manager.hxx
+++ b/scilab/modules/output_stream/includes/diary_manager.hxx
@@ -42,7 +42,7 @@ OUTPUT_STREAM_IMPEXP wchar_t **getDiaryFilenames(int *array_size);
42* @param[out] size of returned array 42* @param[out] size of returned array
43* @return IDs 43* @return IDs
44*/ 44*/
45int *getDiaryIDs(int *array_size); 45OUTPUT_STREAM_IMPEXP int *getDiaryIDs(int *array_size);
46 46
47/** 47/**
48* get all IDs in manager 48* get all IDs in manager
diff --git a/scilab/modules/output_stream/src/c/output_stream.vcxproj b/scilab/modules/output_stream/src/c/output_stream.vcxproj
index 913b2ed..31ed81f 100644
--- a/scilab/modules/output_stream/src/c/output_stream.vcxproj
+++ b/scilab/modules/output_stream/src/c/output_stream.vcxproj
@@ -256,6 +256,8 @@ lib /DEF:"$(ProjectDir)Fileio_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
256 <ClInclude Include="..\..\includes\basout.h" /> 256 <ClInclude Include="..\..\includes\basout.h" />
257 <ClInclude Include="..\..\includes\cerro.h" /> 257 <ClInclude Include="..\..\includes\cerro.h" />
258 <ClInclude Include="..\..\includes\diary.h" /> 258 <ClInclude Include="..\..\includes\diary.h" />
259 <ClInclude Include="..\..\includes\DiaryModesEnum.hxx" />
260 <ClInclude Include="..\..\includes\diary_manager.hxx" />
259 <ClInclude Include="..\..\includes\do_error_number.h" /> 261 <ClInclude Include="..\..\includes\do_error_number.h" />
260 <ClInclude Include="..\..\includes\dynlib_output_stream.h" /> 262 <ClInclude Include="..\..\includes\dynlib_output_stream.h" />
261 <ClInclude Include="..\..\includes\erro.h" /> 263 <ClInclude Include="..\..\includes\erro.h" />
@@ -269,8 +271,6 @@ lib /DEF:"$(ProjectDir)Fileio_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
269 <ClInclude Include="..\..\includes\Sciwarning.h" /> 271 <ClInclude Include="..\..\includes\Sciwarning.h" />
270 <ClInclude Include="..\cpp\Diary.hxx" /> 272 <ClInclude Include="..\cpp\Diary.hxx" />
271 <ClInclude Include="..\cpp\DiaryList.hxx" /> 273 <ClInclude Include="..\cpp\DiaryList.hxx" />
272 <ClInclude Include="..\cpp\DiaryModesEnum.hxx" />
273 <ClInclude Include="..\cpp\diary_manager.hxx" />
274 <ClInclude Include="..\cpp\getDiaryDate.hxx" /> 274 <ClInclude Include="..\cpp\getDiaryDate.hxx" />
275 <ClInclude Include="..\cpp\getUniqueFilename.hxx" /> 275 <ClInclude Include="..\cpp\getUniqueFilename.hxx" />
276 <ClInclude Include="errorTable.h" /> 276 <ClInclude Include="errorTable.h" />
diff --git a/scilab/modules/output_stream/src/c/output_stream.vcxproj.filters b/scilab/modules/output_stream/src/c/output_stream.vcxproj.filters
index ecda6fd..703a612 100644
--- a/scilab/modules/output_stream/src/c/output_stream.vcxproj.filters
+++ b/scilab/modules/output_stream/src/c/output_stream.vcxproj.filters
@@ -164,15 +164,9 @@
164 <ClInclude Include="..\cpp\Diary.hxx"> 164 <ClInclude Include="..\cpp\Diary.hxx">
165 <Filter>Header Files</Filter> 165 <Filter>Header Files</Filter>
166 </ClInclude> 166 </ClInclude>
167 <ClInclude Include="..\cpp\diary_manager.hxx">
168 <Filter>Header Files</Filter>
169 </ClInclude>
170 <ClInclude Include="..\cpp\DiaryList.hxx"> 167 <ClInclude Include="..\cpp\DiaryList.hxx">
171 <Filter>Header Files</Filter> 168 <Filter>Header Files</Filter>
172 </ClInclude> 169 </ClInclude>
173 <ClInclude Include="..\cpp\DiaryModesEnum.hxx">
174 <Filter>Header Files</Filter>
175 </ClInclude>
176 <ClInclude Include="..\cpp\getDiaryDate.hxx"> 170 <ClInclude Include="..\cpp\getDiaryDate.hxx">
177 <Filter>Header Files</Filter> 171 <Filter>Header Files</Filter>
178 </ClInclude> 172 </ClInclude>
@@ -185,6 +179,12 @@
185 <ClInclude Include="..\..\includes\Sciwarning.h"> 179 <ClInclude Include="..\..\includes\Sciwarning.h">
186 <Filter>Header Files</Filter> 180 <Filter>Header Files</Filter>
187 </ClInclude> 181 </ClInclude>
182 <ClInclude Include="..\..\includes\diary_manager.hxx">
183 <Filter>Header Files</Filter>
184 </ClInclude>
185 <ClInclude Include="..\..\includes\DiaryModesEnum.hxx">
186 <Filter>Header Files</Filter>
187 </ClInclude>
188 </ItemGroup> 188 </ItemGroup>
189 <ItemGroup> 189 <ItemGroup>
190 <None Include="core_import.def"> 190 <None Include="core_import.def">