Replaced hardcoding for char16_t and char32_t with configuration

This commit is contained in:
Daniel Marjamäki 2017-03-04 16:30:42 +01:00
parent eb7712c96a
commit 2f2ac46243
4 changed files with 3 additions and 5 deletions

View File

@ -4473,6 +4473,8 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
<type templateParameter="0"/>
</container>
<container id="stdString" startPattern="std :: string|wstring|u16string|u32string" endPattern="" inherits="stdAllString"/>
<podtype name="char16_t,std::char16_t" sign="u" size="2"/>
<podtype name="char32_t,std::char32_t" sign="u" size="4"/>
<podtype name="int8_t,std::int8_t" sign="s" size="1"/>
<podtype name="int16_t,std::int16_t" sign="s" size="2"/>
<podtype name="int32_t,std::int32_t" sign="s" size="4"/>

View File

@ -4349,7 +4349,7 @@ namespace {
const std::set<std::string> cpp_keywords = make_container< std::set<std::string> >() <<
c_keywords <<
"alignas" << "alignof" << "and" << "and_eq" << "asm" << "auto" << "bitand" << "bitor" << "bool" <<
"break" << "case" << "catch" << "char" << "char16_t" << "char32_t" << "class" << "compl" <<
"break" << "case" << "catch" << "char" << "class" << "compl" <<
"concept" << "const" << "constexpr" << "const_cast" << "continue" << "decltype" << "default" <<
"delete" << "do" << "double" << "dynamic_cast" << "else" << "enum" << "explicit" << "export" <<
"extern" << "false" << "float" << "for" << "friend" << "goto" << "if" << "inline" << "int" << "long" <<

View File

@ -117,8 +117,6 @@ static const std::set<std::string> stdTypes =
make_container<std::set<std::string> >() << "bool"
<< "_Bool"
<< "char"
<< "char16_t"
<< "char32_t"
<< "double"
<< "float"
<< "int"

View File

@ -1779,8 +1779,6 @@ void Tokenizer::fillTypeSizes()
{
_typeSize.clear();
_typeSize["char"] = 1;
_typeSize["char16_t"] = 2;
_typeSize["char32_t"] = 4;
_typeSize["_Bool"] = _settings->sizeof_bool;
_typeSize["bool"] = _settings->sizeof_bool;
_typeSize["short"] = _settings->sizeof_short;