Use of overloaded operator '=' is ambiguous (with operand types 'QChar' and 'qmu::char_type' (aka 'wchar_t')).
This commit is contained in:
parent
e8ee6a50ce
commit
e95a29c08e
|
@ -440,7 +440,7 @@ void QmuParserBase::SetExpr(const QString &a_sExpr)
|
||||||
{
|
{
|
||||||
// Check locale compatibility
|
// Check locale compatibility
|
||||||
std::locale loc;
|
std::locale loc;
|
||||||
if (m_pTokenReader->GetArgSep()==std::use_facet<std::numpunct<char_type> >(loc).decimal_point())
|
if (m_pTokenReader->GetArgSep() == QChar(std::use_facet<std::numpunct<char_type> >(loc).decimal_point()))
|
||||||
{
|
{
|
||||||
Error(ecLOCALE);
|
Error(ecLOCALE);
|
||||||
}
|
}
|
||||||
|
|
|
@ -487,7 +487,7 @@ auto QmuParserTokenReader::IsArgSep ( token_type &a_Tok ) -> bool
|
||||||
// copy the separator into null terminated string
|
// copy the separator into null terminated string
|
||||||
QString szSep;
|
QString szSep;
|
||||||
szSep[0] = m_cArgSep;
|
szSep[0] = m_cArgSep;
|
||||||
szSep[1] = 0;
|
szSep[1] = QChar::Null;
|
||||||
|
|
||||||
if ( m_iSynFlags & noARG_SEP )
|
if ( m_iSynFlags & noARG_SEP )
|
||||||
{
|
{
|
||||||
|
|
|
@ -197,7 +197,7 @@ inline void QmuParserTokenReader::IgnoreUndefVar ( bool bIgnore )
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
inline void QmuParserTokenReader::SetArgSep ( char_type cArgSep )
|
inline void QmuParserTokenReader::SetArgSep ( char_type cArgSep )
|
||||||
{
|
{
|
||||||
m_cArgSep = cArgSep;
|
m_cArgSep = QChar(cArgSep);
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
Loading…
Reference in New Issue
Block a user