mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-10-06 00:30:10 -06:00
*ide: Fixed 'press any key' stop at the end of console execution, Core: fixed issue with IniString
git-svn-id: svn://ultimatepp.org/upp/trunk@5124 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
parent
1f341034b8
commit
00baf70dbc
3 changed files with 739 additions and 737 deletions
|
|
@ -426,7 +426,7 @@ String GetIniKey(const char *id)
|
|||
|
||||
namespace Ini {
|
||||
|
||||
String::operator Upp::String()
|
||||
String::operator UPP::String()
|
||||
{
|
||||
ONCELOCK_(loaded) {
|
||||
static Array<UPP::String> ss;
|
||||
|
|
@ -437,7 +437,7 @@ String::operator Upp::String()
|
|||
return *value;
|
||||
}
|
||||
|
||||
Upp::String String::operator=(const UPP::String& s)
|
||||
UPP::String String::operator=(const UPP::String& s)
|
||||
{
|
||||
operator UPP::String();
|
||||
*value = s;
|
||||
|
|
@ -446,7 +446,7 @@ Upp::String String::operator=(const UPP::String& s)
|
|||
|
||||
UPP::String String::ToString() const
|
||||
{
|
||||
return AsString((String)const_cast<Ini::String&>(*this));
|
||||
return (String)const_cast<Ini::String&>(*this);
|
||||
}
|
||||
|
||||
Int::operator int() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue