[trafficserver] branch master updated: Remove commented out includes

[rr...@apache.org]

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

rrm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new c3ef121  Remove commented out includes
c3ef121 is described below

commit c3ef1210b44c59a0ad7d9874c39b81b512780be5
Author: Randall Meyer <ra...@yahoo.com>
AuthorDate: Thu Jul 26 13:04:53 2018 -0700

    Remove commented out includes
---
 example/cppapi/globalhook/GlobalHookPlugin.cc         | 2 +-
 include/tscore/CryptoHash.h                           | 2 --
 iocore/eventsystem/unit_tests/test_MIOBufferWriter.cc | 1 -
 iocore/net/P_SNIActionPerformer.h                     | 1 -
 iocore/net/P_UnixNetProcessor.h                       | 2 --
 iocore/net/test_I_Net.cc                              | 1 -
 proxy/http/Http1ClientSession.h                       | 1 -
 src/traffic_server/EventName.cc                       | 1 -
 src/tscore/unit_tests/test_Scalar.cc                  | 4 +---
 9 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/example/cppapi/globalhook/GlobalHookPlugin.cc b/example/cppapi/globalhook/GlobalHookPlugin.cc
index 9fd245e..e8acbe9 100644
--- a/example/cppapi/globalhook/GlobalHookPlugin.cc
+++ b/example/cppapi/globalhook/GlobalHookPlugin.cc
@@ -17,9 +17,9 @@
  */
 
 #include <iostream>
+
 #include "tscpp/api/GlobalPlugin.h"
 #include "tscpp/api/PluginInit.h"
-//#include<../ts/Diags.h>
 
 using namespace atscppapi;
 using namespace std;
diff --git a/include/tscore/CryptoHash.h b/include/tscore/CryptoHash.h
index 6fe34e1..1cb7848 100644
--- a/include/tscore/CryptoHash.h
+++ b/include/tscore/CryptoHash.h
@@ -28,10 +28,8 @@
 /// Apache Traffic Server commons.
 
 #if TS_ENABLE_FIPS == 1
-// #include "tscore/SHA256.h"
 #define CRYPTO_HASH_SIZE (256 / 8)
 #else
-// #include "tscore/ink_code.h"
 #define CRYPTO_HASH_SIZE (128 / 8)
 #endif
 #define CRYPTO_HEX_SIZE ((CRYPTO_HASH_SIZE * 2) + 1)
diff --git a/iocore/eventsystem/unit_tests/test_MIOBufferWriter.cc b/iocore/eventsystem/unit_tests/test_MIOBufferWriter.cc
index 759a3e9..955bea0 100644
--- a/iocore/eventsystem/unit_tests/test_MIOBufferWriter.cc
+++ b/iocore/eventsystem/unit_tests/test_MIOBufferWriter.cc
@@ -29,7 +29,6 @@
 
 #include "I_EventSystem.h"
 #include "tscore/I_Layout.h"
-//#include "tscore/ink_string.h"
 
 #include "diags.i"
 #include "I_MIOBufferWriter.h"
diff --git a/iocore/net/P_SNIActionPerformer.h b/iocore/net/P_SNIActionPerformer.h
index 4c27c73..957ff3c 100644
--- a/iocore/net/P_SNIActionPerformer.h
+++ b/iocore/net/P_SNIActionPerformer.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "I_EventSystem.h"
-//#include"P_UnixNetProcessor.h"
 #include <vector>
 #include "P_SSLNextProtocolAccept.h"
 #include "tscore/ink_inet.h"
diff --git a/iocore/net/P_UnixNetProcessor.h b/iocore/net/P_UnixNetProcessor.h
index 5c19df4..7cd2208 100644
--- a/iocore/net/P_UnixNetProcessor.h
+++ b/iocore/net/P_UnixNetProcessor.h
@@ -69,5 +69,3 @@ extern UnixNetProcessor unix_netProcessor;
 // accept such events by the EventProcessor.
 //
 extern void initialize_thread_for_net(EThread *thread);
-
-//#include "UnixNet.h"
diff --git a/iocore/net/test_I_Net.cc b/iocore/net/test_I_Net.cc
index 9b6a79e..9961bc0 100644
--- a/iocore/net/test_I_Net.cc
+++ b/iocore/net/test_I_Net.cc
@@ -29,7 +29,6 @@
 /*
  * Choose a net test application
  */
-//#include "NetTest-http-server.c"
 #include "NetTest-simple-proxy.c"
 
 int
diff --git a/proxy/http/Http1ClientSession.h b/proxy/http/Http1ClientSession.h
index 74d7a99..3fafd2d 100644
--- a/proxy/http/Http1ClientSession.h
+++ b/proxy/http/Http1ClientSession.h
@@ -31,7 +31,6 @@
 
 #pragma once
 
-//#include "libts.h"
 #include "P_Net.h"
 #include "InkAPIInternal.h"
 #include "HTTP.h"
diff --git a/src/traffic_server/EventName.cc b/src/traffic_server/EventName.cc
index e45be29..1eb9b58 100644
--- a/src/traffic_server/EventName.cc
+++ b/src/traffic_server/EventName.cc
@@ -26,7 +26,6 @@
 #include <cstring>
 
 #include "P_EventSystem.h"
-// #include "I_Disk.h" unused
 #include "I_Cache.h"
 #include "I_Net.h"
 #include "I_HostDB.h"
diff --git a/src/tscore/unit_tests/test_Scalar.cc b/src/tscore/unit_tests/test_Scalar.cc
index 6e89560..d38c2e8 100644
--- a/src/tscore/unit_tests/test_Scalar.cc
+++ b/src/tscore/unit_tests/test_Scalar.cc
@@ -22,10 +22,8 @@
 */
 
 #include <catch.hpp>
+
 #include "tscore/Scalar.h"
-//#include <string>
-//#include <cstdarg>
-//#include <iostream>
 
 using Bytes      = ts::Scalar<1, off_t>;
 using Paragraphs = ts::Scalar<16, off_t>;