build 185

diff --git a/ChangeLog b/ChangeLog
index 56227fb230b9e00a5dc532b79862e35d10245d0a..a79985be81a0cf89af20e52b4b888e331f8fad6a 100644 (file)
--- 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 156140ce989fca7a322227f17bcb053444343106..3fc7cc7c88ed36e6c4229085d46d204ba3a292d0 100644 (file)
--- 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 78c80d6a140c11455f2dcfe118c5c287fc830f73..78c3ced08df5c748cf3c0c708f660bf1402af68b 100644 (file)
--- a/src/main/build.h
+++ b/src/main/build.h
@@ -10,7 +10,7 @@
 //                                               //
 //-----------------------------------------------//
 
-#define BUILD "184"
+#define BUILD "185"
 
 #endif