]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Merge pull request #1413 in SNORT/snort3 from bool_emplace to master
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Tue, 30 Oct 2018 20:52:22 +0000 (16:52 -0400)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Tue, 30 Oct 2018 20:52:22 +0000 (16:52 -0400)
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

src/network_inspectors/packet_tracer/packet_tracer.cc

index 74248b76a562c69cada91926e9312372a64f2663..af5a3b5cd8fe9a345c255f88775c5b115a72a79c 100644 (file)
@@ -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;
 }