From: Russ Combs <rucombs@cisco.com>
Date: Mon, 25 Jan 2016 20:26:00 +0000 (-0500)
Subject: build 185
X-Git-Tag: 3.0.0-233~658
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b417b774124717c554d6bc697bd5b15b07117f83;p=thirdparty%2Fsnort3.git

build 185
---

diff --git a/ChangeLog b/ChangeLog
index 56227fb23..a79985be8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+16/01/25 - build 185
+
+-- initial host_tracker for new integrated netmap
+-- new_http_inspect refactoring for time and space considerations
+-- fix profiler depth bug
+-- fatal on failed IP rep segment allocation - thanks to Bill Parker
+-- tweaked style guide wrt class declarations
+
 16/01/08 - build 184
 
 -- added new_http_inpsect rule options
diff --git a/doc/style.txt b/doc/style.txt
index 156140ce9..3fc7cc7c8 100644
--- a/doc/style.txt
+++ b/doc/style.txt
@@ -164,6 +164,20 @@ yet firm so feedback is welcome to get something we can live with.
       if ( test )
           foo();
 
+=== Classes
+
+* Use the order public, protected, private top to bottom in a class
+  declaration.
+
+* Keep inline functions in a class declaration very brief, preferably just
+  one line.  If you need a more complex inline function, move the
+  definition outside the class declaration.
+
+* The goal is to have highly readable class declarations.  The user
+  shouldn't have to sift through implementation details to see what is
+  available to the client.
+
+
 === Headers
 
 * Don't hesitate to create a new header if it is needed.  Don't lump
diff --git a/src/main/build.h b/src/main/build.h
index 78c80d6a1..78c3ced08 100644
--- a/src/main/build.h
+++ b/src/main/build.h
@@ -10,7 +10,7 @@
 //                                               //
 //-----------------------------------------------//
 
-#define BUILD "184"
+#define BUILD "185"
 
 #endif