diff options
author | Geir Storli <geirst@yahooinc.com> | 2022-12-21 15:08:48 +0000 |
---|---|---|
committer | Geir Storli <geirst@yahooinc.com> | 2022-12-21 15:49:53 +0000 |
commit | 40add664cca86e6c1591b9503b6ce7f568874388 (patch) | |
tree | 393824345d0d324b7a578ba1b25739bf4499158f /vbench | |
parent | 762d9bb079b201a4fc72c67853909a8d5a3f4f15 (diff) |
Change from typedef to using in misc C++ code.
Diffstat (limited to 'vbench')
-rw-r--r-- | vbench/src/apps/vbench/vbench.cpp | 2 | ||||
-rw-r--r-- | vbench/src/vbench/core/stream.h | 2 | ||||
-rw-r--r-- | vbench/src/vbench/core/string.h | 4 | ||||
-rw-r--r-- | vbench/src/vbench/http/benchmark_headers.cpp | 4 | ||||
-rw-r--r-- | vbench/src/vbench/http/http_connection.h | 2 | ||||
-rw-r--r-- | vbench/src/vbench/http/http_connection_pool.h | 4 | ||||
-rw-r--r-- | vbench/src/vbench/vbench/analyzer.h | 2 | ||||
-rw-r--r-- | vbench/src/vbench/vbench/generator.h | 2 | ||||
-rw-r--r-- | vbench/src/vbench/vbench/request.h | 2 | ||||
-rw-r--r-- | vbench/src/vbench/vbench/request_scheduler.h | 2 | ||||
-rw-r--r-- | vbench/src/vbench/vbench/tagger.h | 2 | ||||
-rw-r--r-- | vbench/src/vbench/vbench/vbench.h | 2 | ||||
-rw-r--r-- | vbench/src/vbench/vbench/worker.h | 2 |
13 files changed, 16 insertions, 16 deletions
diff --git a/vbench/src/apps/vbench/vbench.cpp b/vbench/src/apps/vbench/vbench.cpp index edaa68b8838..ffea64c6034 100644 --- a/vbench/src/apps/vbench/vbench.cpp +++ b/vbench/src/apps/vbench/vbench.cpp @@ -10,7 +10,7 @@ using namespace vbench; VESPA_THREAD_STACK_TAG(vbench_thread); -typedef vespalib::SignalHandler SIG; +using SIG = vespalib::SignalHandler; struct NotifyDone : public vespalib::Runnable { vespalib::Gate &done; diff --git a/vbench/src/vbench/core/stream.h b/vbench/src/vbench/core/stream.h index f6cfdc31ed7..dcbcb3080b9 100644 --- a/vbench/src/vbench/core/stream.h +++ b/vbench/src/vbench/core/stream.h @@ -21,7 +21,7 @@ struct Stream : public Input, public Taintable { ~Stream() { } - typedef std::unique_ptr<Stream> UP; + using UP = std::unique_ptr<Stream>; virtual bool eof() const = 0; }; diff --git a/vbench/src/vbench/core/string.h b/vbench/src/vbench/core/string.h index 0c374d2711a..f09f010e265 100644 --- a/vbench/src/vbench/core/string.h +++ b/vbench/src/vbench/core/string.h @@ -16,9 +16,9 @@ namespace vbench { // define which string class to use #if USE_VESPA_STRING -typedef vespalib::string string; +using string = vespalib::string; #else -typedef std::string string; +using string = std::string; #endif extern string strfmt(const char *fmt, ...) diff --git a/vbench/src/vbench/http/benchmark_headers.cpp b/vbench/src/vbench/http/benchmark_headers.cpp index d40de8da01d..04a9528f335 100644 --- a/vbench/src/vbench/http/benchmark_headers.cpp +++ b/vbench/src/vbench/http/benchmark_headers.cpp @@ -26,8 +26,8 @@ struct HeaderTraverser { }; struct HeaderMapper { typedef BenchmarkHeaders::Value BenchmarkHeaders::*ValueRef; - typedef std::map<string,ValueRef> HeaderMap; - typedef std::map<string,ValueRef>::iterator HeaderEntry; + using HeaderMap = std::map<string,ValueRef>; + using HeaderEntry = std::map<string,ValueRef>::iterator; HeaderMap map; HeaderMapper() : map() { map[NUM_HITS] = &BenchmarkHeaders::num_hits; diff --git a/vbench/src/vbench/http/http_connection.h b/vbench/src/vbench/http/http_connection.h index b0224b5f83d..232be5669c1 100644 --- a/vbench/src/vbench/http/http_connection.h +++ b/vbench/src/vbench/http/http_connection.h @@ -22,7 +22,7 @@ private: public: using CryptoEngine = vespalib::CryptoEngine; - typedef std::unique_ptr<HttpConnection> UP; + using UP = std::unique_ptr<HttpConnection>; HttpConnection(CryptoEngine &crypto, const ServerSpec &server); bool fresh() const { return (_lastUsed < 0); } diff --git a/vbench/src/vbench/http/http_connection_pool.h b/vbench/src/vbench/http/http_connection_pool.h index 6c938abd692..7b77cab1b08 100644 --- a/vbench/src/vbench/http/http_connection_pool.h +++ b/vbench/src/vbench/http/http_connection_pool.h @@ -17,8 +17,8 @@ namespace vbench { class HttpConnectionPool { private: - typedef vespalib::ArrayQueue<HttpConnection::UP> Queue; - typedef std::map<ServerSpec, size_t> Map; + using Queue = vespalib::ArrayQueue<HttpConnection::UP>; + using Map = std::map<ServerSpec, size_t>; using CryptoEngine = vespalib::CryptoEngine; std::mutex _lock; diff --git a/vbench/src/vbench/vbench/analyzer.h b/vbench/src/vbench/vbench/analyzer.h index cddae612fe9..48eb9a56084 100644 --- a/vbench/src/vbench/vbench/analyzer.h +++ b/vbench/src/vbench/vbench/analyzer.h @@ -9,7 +9,7 @@ namespace vbench { struct Analyzer : public Handler<Request> { - typedef std::unique_ptr<Analyzer> UP; + using UP = std::unique_ptr<Analyzer>; virtual void report() = 0; virtual ~Analyzer() {} }; diff --git a/vbench/src/vbench/vbench/generator.h b/vbench/src/vbench/vbench/generator.h index 527e03f24c5..405677be380 100644 --- a/vbench/src/vbench/vbench/generator.h +++ b/vbench/src/vbench/vbench/generator.h @@ -11,7 +11,7 @@ namespace vbench { struct Generator : public vespalib::Runnable, public Taintable { - typedef std::unique_ptr<Generator> UP; + using UP = std::unique_ptr<Generator>; virtual void abort() = 0; virtual ~Generator() {} }; diff --git a/vbench/src/vbench/vbench/request.h b/vbench/src/vbench/vbench/request.h index a913977a325..8fd71770c61 100644 --- a/vbench/src/vbench/vbench/request.h +++ b/vbench/src/vbench/vbench/request.h @@ -17,7 +17,7 @@ namespace vbench { class Request : public HttpResultHandler { public: - typedef std::unique_ptr<Request> UP; + using UP = std::unique_ptr<Request>; enum Status { STATUS_OK = 0, diff --git a/vbench/src/vbench/vbench/request_scheduler.h b/vbench/src/vbench/vbench/request_scheduler.h index 0776f69ceaa..a0fb1eda4e7 100644 --- a/vbench/src/vbench/vbench/request_scheduler.h +++ b/vbench/src/vbench/vbench/request_scheduler.h @@ -32,7 +32,7 @@ private: void run() override; public: - typedef std::unique_ptr<RequestScheduler> UP; + using UP = std::unique_ptr<RequestScheduler>; using CryptoEngine = vespalib::CryptoEngine; RequestScheduler(CryptoEngine::SP crypto, Handler<Request> &next, size_t numWorkers); void abort(); diff --git a/vbench/src/vbench/vbench/tagger.h b/vbench/src/vbench/vbench/tagger.h index 2fa6b411e1d..6e332fb9e10 100644 --- a/vbench/src/vbench/vbench/tagger.h +++ b/vbench/src/vbench/vbench/tagger.h @@ -9,7 +9,7 @@ namespace vbench { struct Tagger : public Handler<Request> { - typedef std::unique_ptr<Tagger> UP; + using UP = std::unique_ptr<Tagger>; virtual ~Tagger() {} }; diff --git a/vbench/src/vbench/vbench/vbench.h b/vbench/src/vbench/vbench/vbench.h index ddcc316f9e6..dbb46e72800 100644 --- a/vbench/src/vbench/vbench/vbench.h +++ b/vbench/src/vbench/vbench/vbench.h @@ -23,7 +23,7 @@ class VBench : public vespalib::Runnable, { private: struct InputChain { - typedef std::unique_ptr<InputChain> UP; + using UP = std::unique_ptr<InputChain>; std::vector<Tagger::UP> taggers; Generator::UP generator; std::unique_ptr<vespalib::Thread> thread; diff --git a/vbench/src/vbench/vbench/worker.h b/vbench/src/vbench/vbench/worker.h index e40f7cd5300..6594a4f3dd6 100644 --- a/vbench/src/vbench/vbench/worker.h +++ b/vbench/src/vbench/vbench/worker.h @@ -30,7 +30,7 @@ private: void run() override; public: - typedef std::unique_ptr<Worker> UP; + using UP = std::unique_ptr<Worker>; Worker(Provider<Request> &provider, Handler<Request> &next, HttpConnectionPool &pool, Timer &timer); void join() override { _thread.join(); } |