diff options
author | Tor Egge <Tor.Egge@yahoo-inc.com> | 2017-05-24 10:09:49 +0000 |
---|---|---|
committer | Tor Egge <Tor.Egge@yahoo-inc.com> | 2017-05-24 10:09:49 +0000 |
commit | adbf51ef6537c663317886a31d908a0ef0e5269d (patch) | |
tree | 193e388361b8942100fe9120a5594c3512180a17 /searchcore/src/apps | |
parent | 67739bd0d1d78e5d27400139b7742c32662f39d8 (diff) |
C++ style fix: Use foo() instead of foo(void)
Diffstat (limited to 'searchcore/src/apps')
5 files changed, 65 insertions, 65 deletions
diff --git a/searchcore/src/apps/fdispatch/fdispatch.cpp b/searchcore/src/apps/fdispatch/fdispatch.cpp index 799c42887da..9f6b13bc858 100644 --- a/searchcore/src/apps/fdispatch/fdispatch.cpp +++ b/searchcore/src/apps/fdispatch/fdispatch.cpp @@ -34,17 +34,17 @@ protected: return (vespalib::SignalHandler::INT.check() || vespalib::SignalHandler::TERM.check()); } - void Usage(void); + void Usage(); bool GetOptions(int *exitCode); public: int Main() override; - FastS_FDispatchApp(void); - ~FastS_FDispatchApp(void); + FastS_FDispatchApp(); + ~FastS_FDispatchApp(); }; -FastS_FDispatchApp::FastS_FDispatchApp(void) +FastS_FDispatchApp::FastS_FDispatchApp() { } @@ -174,7 +174,7 @@ FastS_FDispatchApp::GetOptions(int *exitCode) } void -FastS_FDispatchApp::Usage(void) +FastS_FDispatchApp::Usage() { printf("FAST Search - fdispatch %s\n", FastS_VersionTag); printf("\n" @@ -192,7 +192,7 @@ FastS_FDispatchApp::Usage(void) } -FastS_FDispatchApp::~FastS_FDispatchApp(void) +FastS_FDispatchApp::~FastS_FDispatchApp() { } diff --git a/searchcore/src/apps/tests/persistenceconformance_test.cpp b/searchcore/src/apps/tests/persistenceconformance_test.cpp index a0bb3cf8591..719abe08612 100644 --- a/searchcore/src/apps/tests/persistenceconformance_test.cpp +++ b/searchcore/src/apps/tests/persistenceconformance_test.cpp @@ -232,7 +232,7 @@ public: } void - close(void) + close() { for (DocumentDBMap::iterator itr = _docDbs.begin(); itr != _docDbs.end(); ++itr) { @@ -259,12 +259,12 @@ protected: } virtual - ~DocDBRepoHolder(void) + ~DocDBRepoHolder() { } void - close(void) + close() { if (_docDbRepo.get() != NULL) _docDbRepo->close(); @@ -320,7 +320,7 @@ public: } void - removeHandlers(void) + removeHandlers() { if (_docDbRepo.get() == NULL) return; @@ -332,7 +332,7 @@ public: } virtual - ~MyPersistenceEngine(void) + ~MyPersistenceEngine() { destroyIterators(); removeHandlers(); // Block calls to document db from engine @@ -385,12 +385,12 @@ public: struct FixtureBaseBase { - FixtureBaseBase(void) + FixtureBaseBase() { FastOS_FileInterface::EmptyAndRemoveDirectory("testdb"); } - ~FixtureBaseBase(void) + ~FixtureBaseBase() { FastOS_FileInterface::EmptyAndRemoveDirectory("testdb"); } @@ -408,7 +408,7 @@ struct FixtureBase : public FixtureBaseBase docType))) { } - ~FixtureBase(void) + ~FixtureBase() { } }; diff --git a/searchcore/src/apps/vespa-gen-testdocs/vespa-gen-testdocs.cpp b/searchcore/src/apps/vespa-gen-testdocs/vespa-gen-testdocs.cpp index 7b7527da6ef..d9f6857754f 100644 --- a/searchcore/src/apps/vespa-gen-testdocs/vespa-gen-testdocs.cpp +++ b/searchcore/src/apps/vespa-gen-testdocs/vespa-gen-testdocs.cpp @@ -20,7 +20,7 @@ using namespace vespalib::alloc; using vespalib::string; void -usageHeader(void) +usageHeader() { using std::cerr; cerr << @@ -148,13 +148,13 @@ public: FieldGenerator(const string &name); virtual - ~FieldGenerator(void); + ~FieldGenerator(); virtual void - setup(void); + setup(); virtual void - clear(void); + clear(); virtual void deleteHistogram(const string &baseDir, @@ -175,19 +175,19 @@ FieldGenerator::FieldGenerator(const string &name) { } -FieldGenerator::~FieldGenerator(void) +FieldGenerator::~FieldGenerator() { } void -FieldGenerator::setup(void) +FieldGenerator::setup() { } void -FieldGenerator::clear(void) +FieldGenerator::clear() { } @@ -229,13 +229,13 @@ public: uint32_t maxFill); virtual - ~RandTextFieldGenerator(void); + ~RandTextFieldGenerator(); virtual void - setup(void) override; + setup() override; virtual void - clear(void) override; + clear() override; virtual void deleteHistogram(const string &baseDir, const string &name) override; @@ -267,13 +267,13 @@ RandTextFieldGenerator::RandTextFieldGenerator(const string &name, -RandTextFieldGenerator::~RandTextFieldGenerator(void) +RandTextFieldGenerator::~RandTextFieldGenerator() { } void -RandTextFieldGenerator::setup(void) +RandTextFieldGenerator::setup() { LOG(info, "generating dictionary for field %s (%u words)", @@ -284,7 +284,7 @@ RandTextFieldGenerator::setup(void) void -RandTextFieldGenerator::clear(void) +RandTextFieldGenerator::clear() { typedef std::vector<uint32_t>::iterator HI; for (HI i(_histogram.begin()), ie(_histogram.end()); i != ie; ++i) { @@ -363,10 +363,10 @@ public: const std::vector<uint32_t> &mods); virtual - ~ModTextFieldGenerator(void); + ~ModTextFieldGenerator(); virtual void - clear(void) override; + clear() override; virtual void writeHistogram(const string &name); @@ -386,13 +386,13 @@ ModTextFieldGenerator::ModTextFieldGenerator(const string &name, } -ModTextFieldGenerator::~ModTextFieldGenerator(void) +ModTextFieldGenerator::~ModTextFieldGenerator() { } void -ModTextFieldGenerator::clear(void) +ModTextFieldGenerator::clear() { } @@ -427,10 +427,10 @@ public: IdTextFieldGenerator(const string &name); virtual - ~IdTextFieldGenerator(void); + ~IdTextFieldGenerator(); virtual void - clear(void) override; + clear() override; virtual void writeHistogram(const string &name); @@ -446,13 +446,13 @@ IdTextFieldGenerator::IdTextFieldGenerator(const string &name) } -IdTextFieldGenerator::~IdTextFieldGenerator(void) +IdTextFieldGenerator::~IdTextFieldGenerator() { } void -IdTextFieldGenerator::clear(void) +IdTextFieldGenerator::clear() { } @@ -486,10 +486,10 @@ public: uint32_t count); virtual - ~RandIntFieldGenerator(void); + ~RandIntFieldGenerator(); virtual void - clear(void) override; + clear() override; virtual void writeHistogram(const string &name); @@ -512,13 +512,13 @@ RandIntFieldGenerator::RandIntFieldGenerator(const string &name, } -RandIntFieldGenerator::~RandIntFieldGenerator(void) +RandIntFieldGenerator::~RandIntFieldGenerator() { } void -RandIntFieldGenerator::clear(void) +RandIntFieldGenerator::clear() { } @@ -549,16 +549,16 @@ class DocumentGenerator const FieldVec _fields; void - setup(void); + setup(); public: DocumentGenerator(const string &docType, const string &idPrefix, const FieldVec &fields); - ~DocumentGenerator(void); + ~DocumentGenerator(); void - clear(void); + clear(); void deleteHistogram(const string &baseDir, @@ -591,12 +591,12 @@ DocumentGenerator::DocumentGenerator(const string &docType, } -DocumentGenerator::~DocumentGenerator(void) +DocumentGenerator::~DocumentGenerator() { } void -DocumentGenerator::setup(void) +DocumentGenerator::setup() { typedef FieldVec::const_iterator FI; for (FI i(_fields.begin()), ie(_fields.end()); i != ie; ++i) { @@ -606,7 +606,7 @@ DocumentGenerator::setup(void) void -DocumentGenerator::clear(void) +DocumentGenerator::clear() { typedef FieldVec::const_iterator FI; for (FI i(_fields.begin()), ie(_fields.end()); i != ie; ++i) { @@ -694,7 +694,7 @@ public: } virtual - ~SubApp(void) + ~SubApp() { } @@ -702,10 +702,10 @@ public: usage(bool showHeader) = 0; virtual bool - getOptions(void) = 0; + getOptions() = 0; virtual int - run(void) = 0; + run() = 0; }; class GenTestDocsApp : public SubApp @@ -748,7 +748,7 @@ public: } virtual - ~GenTestDocsApp(void) + ~GenTestDocsApp() { } @@ -756,10 +756,10 @@ public: usage(bool showHeader) override; virtual bool - getOptions(void) override; + getOptions() override; virtual int - run(void) override; + run() override; }; @@ -785,7 +785,7 @@ GenTestDocsApp::usage(bool showHeader) } bool -GenTestDocsApp::getOptions(void) +GenTestDocsApp::getOptions() { int c; const char *optArgument = NULL; @@ -898,7 +898,7 @@ GenTestDocsApp::getOptions(void) int -GenTestDocsApp::run(void) +GenTestDocsApp::run() { printf("Hello world\n"); string idPrefix("id:test:"); @@ -918,21 +918,21 @@ class App : public FastOS_Application { public: void - usage(void); + usage(); int - Main(void) override; + Main() override; }; void -App::usage(void) +App::usage() { GenTestDocsApp(*this).usage(true); } int -App::Main(void) +App::Main() { if (_argc < 2) { usage(); diff --git a/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp b/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp index 3931daf7fdd..0214913f6ae 100644 --- a/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp +++ b/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp @@ -87,7 +87,7 @@ public: } void - monitorLoop(void); + monitorLoop(); void scanSpecs(slobrok::api::MirrorAPI::SpecList &specs, @@ -421,7 +421,7 @@ public: void -App::monitorLoop(void) +App::monitorLoop() { for (;;) { FRT_RPCRequest *req = _supervisor->AllocRPCRequest(); diff --git a/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp b/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp index 73e1fcd09a5..95c6d39c51a 100644 --- a/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp +++ b/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp @@ -47,10 +47,10 @@ class ConfigFile std::vector<char> _content; public: - ConfigFile(void); + ConfigFile(); const vespalib::string & - getName(void) const + getName() const { return _name; } @@ -59,11 +59,11 @@ public: deserialize(vespalib::nbostream &stream); void - print(void) const; + print() const; }; -ConfigFile::ConfigFile(void) +ConfigFile::ConfigFile() : _name(), _modTime(0), _content() @@ -87,7 +87,7 @@ ConfigFile::deserialize(vespalib::nbostream &stream) } void -ConfigFile::print(void) const +ConfigFile::print() const { std::cout << "Name: " << _name << "\n" << "ModTime: " << _modTime << "\n" << @@ -108,7 +108,7 @@ operator>>(vespalib::nbostream &stream, ConfigFile &configFile) struct DummyStreamHandler : public NewConfigOperation::IStreamHandler { std::map<std::string, ConfigFile> _cfs; - DummyStreamHandler(void) + DummyStreamHandler() : NewConfigOperation::IStreamHandler(), _cfs() { |