From 0b07c4674dfadfcbab8f41f00a19fcc33cd404a1 Mon Sep 17 00:00:00 2001
From: firewave <firewave@users.noreply.github.com>
Date: Fri, 5 Sep 2025 21:44:52 +0200
Subject: [PATCH] moved static array into `simplifyName()` and simplified it

---
 simplecpp.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/simplecpp.cpp b/simplecpp.cpp
index 1e18d2ef..32686da6 100644
--- a/simplecpp.cpp
+++ b/simplecpp.cpp
@@ -2666,12 +2666,11 @@ static void simplifyHasInclude(simplecpp::TokenList &expr, const simplecpp::DUI
     }
 }
 
-static const char * const altopData[] = {"and","or","bitand","bitor","compl","not","not_eq","xor"};
-static const std::set<std::string> altop(&altopData[0], &altopData[8]);
 static void simplifyName(simplecpp::TokenList &expr)
 {
     for (simplecpp::Token *tok = expr.front(); tok; tok = tok->next) {
         if (tok->name) {
+            static const std::set<std::string> altop = {"and","or","bitand","bitor","compl","not","not_eq","xor"};
             if (altop.find(tok->str()) != altop.end()) {
                 bool alt;
                 if (tok->str() == "not" || tok->str() == "compl") {