From: Michael Altizer (mialtize) <mialtize@cisco.com>
Date: Tue, 30 Oct 2018 20:52:22 +0000 (-0400)
Subject: Merge pull request #1413 in SNORT/snort3 from bool_emplace to master
X-Git-Tag: 3.0.0-249~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70dc48d35bb79b071290c9da3f33937a081673bd;p=thirdparty%2Fsnort3.git

Merge pull request #1413 in SNORT/snort3 from bool_emplace to master

Squashed commit of the following:

commit 0bed4caf5b28d7e0a78af7bd4467dad6776632b5
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Tue Oct 30 15:13:37 2018 -0400

    packet_tracer: can't emplace vector<bool> until c++14
---

diff --git a/src/network_inspectors/packet_tracer/packet_tracer.cc b/src/network_inspectors/packet_tracer/packet_tracer.cc
index 74248b76a..af5a3b5cd 100644
--- a/src/network_inspectors/packet_tracer/packet_tracer.cc
+++ b/src/network_inspectors/packet_tracer/packet_tracer.cc
@@ -198,7 +198,7 @@ PacketTracer::TracerMute PacketTracer::get_mute()
     if ( s_pkt_trace == nullptr )
         return global_mutes.val - 1;
 
-    s_pkt_trace->mutes.emplace_back(false);
+    s_pkt_trace->mutes.push_back(false);
     return s_pkt_trace->mutes.size() - 1;
 }