From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Thu, 17 Nov 2016 19:27:11 +0000 (-0500)
Subject: Merge pull request #708 in SNORT/snort3 from obfucator_warning_fix to master
X-Git-Tag: 3.0.0-233~187
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5cc5fc5aff20040a52fcaef00fc4f1cbf544aec5;p=thirdparty%2Fsnort3.git

Merge pull request #708 in SNORT/snort3 from obfucator_warning_fix to master

Squashed commit of the following:

commit 85dc8a679a7e181b24bad1cd4207d59b4772db29
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Thu Nov 17 14:00:57 2016 -0500

    obfuscator warning fix
---

diff --git a/src/log/obfuscator.h b/src/log/obfuscator.h
index aa2be6e83..47e177a21 100644
--- a/src/log/obfuscator.h
+++ b/src/log/obfuscator.h
@@ -65,7 +65,7 @@ public:
     bool first(ObfuscatorBlock &b);
     bool next(ObfuscatorBlock &b);
 
-    const char get_mask_char()
+    char get_mask_char()
     { return mask_char; }
 
 private: