[trafficserver] branch 6.2.x updated: TS-4512: Error when building with gcc 6.1.1

[so...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/6.2.x by this push:
       new  c4a79f7   TS-4512: Error when building with gcc 6.1.1
c4a79f7 is described below

commit c4a79f799f873c394403ab1fb104740ed90cc742
Author: Bryan Call <bc...@apache.org>
AuthorDate: Mon Jun 27 11:35:36 2016 -0700

    TS-4512: Error when building with gcc 6.1.1
    
    (cherry picked from commit 78d6bbb8dbdcffce68acada02e71efe50bce37c2)
---
 proxy/InkAPITest.cc        | 1 -
 proxy/logging/LogObject.cc | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/proxy/InkAPITest.cc b/proxy/InkAPITest.cc
index d156403..e6beae1 100644
--- a/proxy/InkAPITest.cc
+++ b/proxy/InkAPITest.cc
@@ -48,7 +48,6 @@
 
 #include "InkAPITestTool.cc"
 #include "http/HttpSM.h"
-#include "ts/TestBox.h"
 
 #define TC_PASS 1
 #define TC_FAIL 0
diff --git a/proxy/logging/LogObject.cc b/proxy/logging/LogObject.cc
index b027d91..c6c94c4 100644
--- a/proxy/logging/LogObject.cc
+++ b/proxy/logging/LogObject.cc
@@ -1388,6 +1388,8 @@ REGRESSION_TEST(LogObjectManager_Transfer)(RegressionTest *t, int /* atype ATS_U
     mgr2.transfer_objects(mgr1);
 
     rprintf(t, "mgr1 has %d objects, mgr2 has %d objects\n", (int)mgr1.get_num_objects(), (int)mgr2.get_num_objects());
+    box.check(mgr1.get_num_objects() == 0, "Testing that manager 1 has 0 objects");
+    box.check(mgr2.get_num_objects() == 4, "Testing that manager 2 has 4 objects");
 
     rprintf(t, "running Log::periodoc_tasks()\n");
     Log::periodic_tasks(Thread::get_hrtime() / HRTIME_SECOND);

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].