From: Mike Stepanek (mstepane) <mstepane@cisco.com>
Date: Fri, 3 Dec 2021 14:06:32 +0000 (+0000)
Subject: Pull request #3199: Compilation fix with GCC5
X-Git-Tag: 3.1.19.0~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=116770292957f565a41453ecb6a40c49b44db8c2;p=thirdparty%2Fsnort3.git

Pull request #3199: Compilation fix with GCC5

Merge in SNORT/snort3 from ~OSERHIIE/snort3:gcc5_compile_fix to master

Squashed commit of the following:

commit d1b153c75fe8ca2de7d86f8078c482b23af5fa00
Author: Oleksandr Serhiienko <oserhiie@cisco.com>
Date:   Fri Dec 3 02:46:58 2021 -0500

    utils: (JSTokenizer) fix braces initialization compilation error (gcc5)
---

diff --git a/src/utils/js_tokenizer.l b/src/utils/js_tokenizer.l
index 4159e6617..762583ea8 100644
--- a/src/utils/js_tokenizer.l
+++ b/src/utils/js_tokenizer.l
@@ -1488,7 +1488,7 @@ void JSTokenizer::states_reset()
     if (tmp_buffer)
         switch_to_initial();
 
-    brace_depth = {};
+    brace_depth = std::stack<uint16_t, std::vector<uint16_t>>();
     token = UNDEFINED;
     previous_group = ASI_OTHER;
 
@@ -1501,7 +1501,7 @@ void JSTokenizer::states_reset()
 
     newline_found = false;
 
-    scope_stack = {};
+    scope_stack = std::stack<Scope>();
     scope_stack.emplace(GLOBAL);
     BEGIN(regst);
 }