generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Work around bug in gcc 4.6 for initializer_list

Browse Source 
Hopefully also fixes MSVC 2012
This commit is contained in:
Jason Turner
2014-11-17 07:02:52 -07:00
parent 1e8c0ab93e
commit 423e872720
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/chaiscript/language/chaiscript_parser.hpp
View File

@@ -1836,9 +1836,9 @@ namespace chaiscript
/// Reads a unary prefixed expression from input /// Reads a unary prefixed expression from input
bool Prefix() { bool Prefix() {
const auto prev_stack_top = m_match_stack.size(); const auto prev_stack_top = m_match_stack.size();
// const std::array<std::string, 7> prefix_opers; const std::vector<std::string> prefix_opers{"++", "--", "-", "+", "!", "~", "&"};
for (const auto &oper : std::initializer_list<std::string>{"++", "--", "-", "+", "!", "~", "&"}) for (const auto &oper : prefix_opers)
{ {
bool is_char = oper.size() == 1; bool is_char = oper.size() == 1;
if ((is_char && Char(oper[0], true)) || (!is_char && Symbol(oper.c_str(), true))) if ((is_char && Char(oper[0], true)) || (!is_char && Symbol(oper.c_str(), true)))