[trafficserver] branch 7.1.x updated: Remove using namespace std
This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/7.1.x by this push:
new e1abccf Remove using namespace std
e1abccf is described below
commit e1abccfb28dffbaaaf7f57c7acf06583d0934d00
Author: Masaori Koshiba
AuthorDate: Wed Nov 6 08:47:29 2019 +0900
Remove using namespace std
To fix build issue on FreeBSD 12.1 & LLVM-9 on macOS
(cherry picked from commit e50520f4a4954ed8375e00594d86a11556e3d95c)
Conflicts:
iocore/cache/CacheTest.cc
src/traffic_top/stats.h
---
cmd/traffic_top/stats.h | 13 ++---
iocore/cache/CacheTest.cc | 4 +---
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/cmd/traffic_top/stats.h b/cmd/traffic_top/stats.h
index f35c163..8fdcc00 100644
--- a/cmd/traffic_top/stats.h
+++ b/cmd/traffic_top/stats.h
@@ -32,8 +32,6 @@
#include
#include "mgmtapi.h"
-using namespace std;
-
struct LookupItem {
LookupItem(const char *s, const char *n, const int t) : pretty(s), name(n),
numerator(""), denominator(""), type(t) {}
LookupItem(const char *s, const char *n, const char *d, const int t) :
pretty(s), name(n), numerator(n), denominator(d), type(t)
@@ -49,7 +47,7 @@ extern size_t write_data(void *ptr, size_t size, size_t
nmemb, void *stream);
#if HAS_CURL
extern char curl_error[CURL_ERROR_SIZE];
#endif
-extern string response;
+extern std::string response;
namespace constant
{
@@ -62,6 +60,9 @@ const char end[] = "\",\n";
//
class Stats
{
+ using string= std::string;
+ template using map = std::map;
+
public:
Stats(const string ) : _url(url)
{
@@ -494,6 +495,12 @@ public:
}
private:
+ std::pair
+ make_pair(std::string s, LookupItem i)
+ {
+ return std::make_pair(s, i);
+ }
+
map *_stats;
map *_old_stats;
map lookup_table;
diff --git a/iocore/cache/CacheTest.cc b/iocore/cache/CacheTest.cc
index 3aca888..173f3c4 100644
--- a/iocore/cache/CacheTest.cc
+++ b/iocore/cache/CacheTest.cc
@@ -28,8 +28,6 @@
#include
#include
-using namespace std;
-
CacheTestSM::CacheTestSM(RegressionTest *t, const char *name)
: RegressionSM(t),
start_memcpy_on_clone(0),
@@ -546,7 +544,7 @@ test_RamCache(RegressionTest *t, RamCache *cache, const
char *name, int64_t cach
bool pass = true;
CacheKey key;
Vol *vol = theCache->key_to_vol(, "example.com", sizeof("example.com") -
1);
- vector> data;
+ std::vector> data;
cache->init(cache_size, vol);
[trafficserver] branch master updated: Fix typos in comments
This is an automated email from the ASF dual-hosted git repository.
scw00 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 ad89f72 Fix typos in comments
ad89f72 is described below
commit ad89f720fa1bc769db5f0aac9897ff2689c74051
Author: takkitano
AuthorDate: Wed May 6 18:09:17 2020 +0900
Fix typos in comments
---
iocore/eventsystem/I_EThread.h | 2 +-
lib/records/RecConfigParse.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/iocore/eventsystem/I_EThread.h b/iocore/eventsystem/I_EThread.h
index 45afc73..d8ee534 100644
--- a/iocore/eventsystem/I_EThread.h
+++ b/iocore/eventsystem/I_EThread.h
@@ -118,7 +118,7 @@ public:
@param c Continuation to be called back as soon as possible.
@param callback_event Event code to be passed back to the
- continuation's handler. See the the EventProcessor class.
+ continuation's handler. See the EventProcessor class.
@param cookie User-defined value or pointer to be passed back
in the Event's object cookie field.
@return Reference to an Event object representing the scheduling
diff --git a/lib/records/RecConfigParse.cc b/lib/records/RecConfigParse.cc
index f81d271..d8272f8 100644
--- a/lib/records/RecConfigParse.cc
+++ b/lib/records/RecConfigParse.cc
@@ -193,7 +193,7 @@ RecConfigFileParse(const char *path, RecConfigEntryCallback
handler)
if (ln) {
// 'ln' will point to either the next token or a bunch of spaces
// if the user didn't supply a value (e.g. 'STRING '). First
- // scan past all of the spaces. If we hit a '\0', then we we
+ // scan past all of the spaces. If we hit a '\0', then we
// know we didn't have a valid value. If not, set 'data_str' to
// the start of the token and scan until we find the end. Once
// the end is found, back-peddle to remove any trailing spaces.
[trafficserver] branch master updated: Remove unused index for SSL application specific data
This is an automated email from the ASF dual-hosted git repository.
maskit 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 e5d51e4 Remove unused index for SSL application specific data
e5d51e4 is described below
commit e5d51e478ee94fa77b5ebf91f71effdc25839a8d
Author: Masakazu Kitajo
AuthorDate: Tue May 5 12:03:49 2020 +0900
Remove unused index for SSL application specific data
ssl_session_ticket_index is registerd but unused.
---
iocore/net/SSLUtils.cc | 11 ---
1 file changed, 11 deletions(-)
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index 2dbfb27..39a160d 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -92,10 +92,6 @@ static constexpr char SSL_CERT_SEPARATE_DELIM = ',';
SSLSessionCache *session_cache; // declared extern in P_SSLConfig.h
-#if TS_HAVE_OPENSSL_SESSION_TICKETS
-static int ssl_session_ticket_index = -1;
-#endif
-
static int ssl_vc_index = -1;
static ink_mutex *mutex_buf = nullptr;
@@ -912,13 +908,6 @@ SSLInitializeLibrary()
CRYPTO_set_dynlock_destroy_callback(ssl_dyn_destroy_callback);
}
-#ifdef TS_HAVE_OPENSSL_SESSION_TICKETS
- ssl_session_ticket_index = SSL_CTX_get_ex_new_index(0, nullptr, nullptr,
nullptr, ssl_session_ticket_free);
- if (ssl_session_ticket_index == -1) {
-SSLError("failed to create session ticket index");
- }
-#endif
-
#if TS_USE_TLS_OCSP
ssl_stapling_ex_init();
#endif /* TS_USE_TLS_OCSP */
