vitorsousa pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=25ef604467b083d1f5ff2c7f9a1a82e660e04443
commit 25ef604467b083d1f5ff2c7f9a1a82e660e04443
Author: Vitor Sousa <vitorso...@expertisesolutions.com.br>
Date: Mon Jul 8 12:46:25 2019 -0300
Revert "efl: prevent usage of some Eina.* stub types in stable APIs"
C# does not support `slice` and `rw_slice` yet.
Reverting until proper support lands.
This reverts commit ec7bc0eddd7abc77d28605b0a6f0aea2e246a0ee.
---
src/lib/efl/interfaces/efl_io_reader.eo | 2 +-
src/lib/efl/interfaces/efl_io_writer.eo | 4 ++--
src/lib/eo/eina_types.eot | 22 +++++++++++-----------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/lib/efl/interfaces/efl_io_reader.eo
b/src/lib/efl/interfaces/efl_io_reader.eo
index 374e81e1fb..2e166031a9 100644
--- a/src/lib/efl/interfaces/efl_io_reader.eo
+++ b/src/lib/efl/interfaces/efl_io_reader.eo
@@ -29,7 +29,7 @@ interface Efl.Io.Reader {
You can understand this method as read(2) libc function.
]]
params {
- @inout rw_slice: rw_slice<ubyte>; [[Provides a pre-allocated
memory to be filled up to rw_slice.len. It will be populated and the length
will be set to the actually used amount of bytes, which can be smaller than the
request.]]
+ @inout rw_slice: Eina.Rw_Slice; [[Provides a pre-allocated
memory to be filled up to rw_slice.len. It will be populated and the length
will be set to the actually used amount of bytes, which can be smaller than the
request.]]
}
return: Eina.Error; [[0 on succeed, a mapping of errno otherwise]]
}
diff --git a/src/lib/efl/interfaces/efl_io_writer.eo
b/src/lib/efl/interfaces/efl_io_writer.eo
index d83d5beb0f..471b6a0d60 100644
--- a/src/lib/efl/interfaces/efl_io_writer.eo
+++ b/src/lib/efl/interfaces/efl_io_writer.eo
@@ -29,8 +29,8 @@ interface Efl.Io.Writer {
You can understand this method as write(2) libc function.
]]
params {
- @inout slice: slice<ubyte>; [[Provides a pre-populated memory
to be used up to slice.len. The returned slice will be adapted as length will
be set to the actually used amount of bytes, which can be smaller than the
request.]]
- @out remaining: slice<ubyte> @optional; [[Convenience to
output the remaining parts of slice that was not written. If the full slice was
written, this will be a slice of zero-length.]]
+ @inout slice: Eina.Slice; [[Provides a pre-populated memory to
be used up to slice.len. The returned slice will be adapted as length will be
set to the actually used amount of bytes, which can be smaller than the
request.]]
+ @out remaining: Eina.Slice @optional; [[Convenience to output
the remaining parts of slice that was not written. If the full slice was
written, this will be a slice of zero-length.]]
}
return: Eina.Error; [[0 on succeed, a mapping of errno otherwise]]
}
diff --git a/src/lib/eo/eina_types.eot b/src/lib/eo/eina_types.eot
index d936901eea..95d15a4782 100644
--- a/src/lib/eo/eina_types.eot
+++ b/src/lib/eo/eina_types.eot
@@ -42,9 +42,9 @@ struct @extern Eina.Matrix3 {
zz: double; [[ZZ matrix value]]
}
-type @extern @beta Eina.Unicode: uint32; [[Eina unicode type]]
+type @extern Eina.Unicode: uint32; [[Eina unicode type]]
-struct @extern @beta Eina.File_Direct_Info; [[Eina file direct information
data structure]]
+struct @extern Eina.File_Direct_Info; [[Eina file direct information data
structure]]
/*{
path_lenght: size_t; [[Size of the whole path]]
name_length: size_t; [[Size of the filename/basename
component]]
@@ -53,7 +53,7 @@ struct @extern @beta Eina.File_Direct_Info; [[Eina file
direct information data
path: char[EINA_PATH_MAX]; [[The path]]
};*/
-enum @extern @beta Eina.Xattr.Flags {
+enum @extern Eina.Xattr.Flags {
[[Eina file extended attributes flags]]
insert, [[This is the default behaviour, it will either create or replace
the extended attribute]]
replace, [[This will only succeed if the extended attribute previously
existed]]
@@ -62,25 +62,25 @@ enum @extern @beta Eina.Xattr.Flags {
type @extern Eina.Error: int; [[Eina error type]]
-struct @extern @beta @free(eina_binbuf_free) Eina.Binbuf; [[Eina binbuf data
structure]]
-struct @extern @beta @free(eina_strbuf_free) Eina.Strbuf; [[Eina strbuf data
structure]]
+struct @extern @free(eina_binbuf_free) Eina.Binbuf; [[Eina binbuf data
structure]]
+struct @extern @free(eina_strbuf_free) Eina.Strbuf; [[Eina strbuf data
structure]]
-struct @extern @beta Eina.Slice {
+struct @extern Eina.Slice {
[[A linear, read-only, memory segment]]
len: size; [[Length of the memory segment]]
mem: const(void_ptr); [[Pointer to memory segment]]
}
-struct @extern @beta Eina.Rw_Slice {
+struct @extern Eina.Rw_Slice {
[[A linear, read-write, memory segment]]
len: size; [[Length of the memory segment]]
mem: void_ptr; [[Pointer to memory segment]]
}
-struct @extern @beta Eina.Value; [[Eina value placeholder so it can be
referenced from docs.]]
-struct @extern @beta Eina.Value_Type; [[Eina value type]]
+struct @extern Eina.Value; [[Eina value placeholder so it can be referenced
from docs.]]
+struct @extern Eina.Value_Type; [[Eina value type]]
-struct @extern @beta Eina.Stat {
+struct @extern Eina.Stat {
[[The structure to store some file statistics.]]
dev : ulong; [[The device where this file is located]]
ino : ulong; [[The inode]]
@@ -103,5 +103,5 @@ struct @extern @beta Eina.Stat {
struct @extern @free(eina_promise_free) Eina.Promise; [[Eina promise type]]
/* FIXME: This definitely shouldn't be here. */
-type @beta Efl.Event_Cb: __undefined_type; [[Efl event callback type]]
+type Efl.Event_Cb: __undefined_type; [[Efl event callback type]]
--
