summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-06-15 11:08:10 +0200
committerGitHub <noreply@github.com>2016-06-15 11:08:10 +0200
commitee105744e0c6bc64f76124b0a80f0f4ac96c5957 (patch)
treeaaed03682b874c9fb47811b23f763160e5ab9e7b
parent2345f7fcae53b12e3da15b8e57fdf9c79669ca10 (diff)
parent58a891265aabc7944ae5b7e588b64ff21ecd3ea8 (diff)
Merge pull request #5210 from J08nY/issue-5189
String documentation: .ord_at() returns int not String
-rw-r--r--core/variant_call.cpp2
-rw-r--r--doc/base/classes.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/variant_call.cpp b/core/variant_call.cpp
index 94ab93d55c..f3f38f074e 100644
--- a/core/variant_call.cpp
+++ b/core/variant_call.cpp
@@ -1290,7 +1290,7 @@ _VariantCall::addfunc(Variant::m_vtype,Variant::m_ret,_SCS(#m_method),VCALL(m_cl
ADDFUNC0(STRING,STRING,String,extension,varray());
ADDFUNC0(STRING,STRING,String,basename,varray());
ADDFUNC1(STRING,STRING,String,plus_file,STRING,"file",varray());
- ADDFUNC1(STRING,STRING,String,ord_at,INT,"at",varray());
+ ADDFUNC1(STRING,INT,String,ord_at,INT,"at",varray());
ADDFUNC2(STRING,NIL,String,erase,INT,"pos",INT,"chars", varray());
ADDFUNC0(STRING,INT,String,hash,varray());
ADDFUNC0(STRING,STRING,String,md5_text,varray());
diff --git a/doc/base/classes.xml b/doc/base/classes.xml
index 71e972bac6..5a8e695a64 100644
--- a/doc/base/classes.xml
+++ b/doc/base/classes.xml
@@ -37422,7 +37422,7 @@ This method controls whether the position between two cached points is interpola
</description>
</method>
<method name="ord_at">
- <return type="String">
+ <return type="int">
</return>
<argument index="0" name="at" type="int">
</argument>