Skip to content

Commit 4d30fda

Browse files
committed
Fix spammy -Winconsistent-override in HHVM
Newer LLVM introduces `-Winconsistent-override` which is quite noisy for a few frequently-included headers in HHVM. Fix occurrences.
1 parent d911b10 commit 4d30fda

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

hphp/runtime/ext/reflection/ext_reflection.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2519,7 +2519,7 @@ struct ReflectionExtension final : Extension {
25192519
ReflectionExtensionLoader::className());
25202520
}
25212521

2522-
std::vector<std::string> hackFiles() const {
2522+
std::vector<std::string> hackFiles() const override {
25232523
return {
25242524
"reflection.php",
25252525
"reflection-classes.php",

hphp/runtime/ext/vsdebug/ext_vsdebug.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ struct VSDebugExtension final : Extension {
3737
void threadShutdown() override;
3838
bool moduleEnabled() const override { return m_enabled; }
3939

40-
std::vector<std::string> hackFiles() const { return {}; }
40+
std::vector<std::string> hackFiles() const override { return {}; }
4141

4242
static Debugger* getDebugger() {
4343
std::atomic_thread_fence(std::memory_order_acquire);

hphp/runtime/server/transport.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ struct Transport : IDebuggable, ITransportHeaders {
165165
/**
166166
* Request URI.
167167
*/
168-
virtual const char *getUrl() = 0;
168+
virtual const char *getUrl() override = 0;
169169
virtual const char *getRemoteHost() = 0;
170170
virtual uint16_t getRemotePort() = 0;
171171
// The transport can override REMOTE_ADDR if it has one
@@ -220,7 +220,7 @@ struct Transport : IDebuggable, ITransportHeaders {
220220
/**
221221
* POST request's data.
222222
*/
223-
virtual const void *getPostData(size_t &size) = 0;
223+
virtual const void *getPostData(size_t &size) override = 0;
224224
virtual bool hasMorePostData() { return false; }
225225
virtual const void *getMorePostData(size_t &size) { size = 0;return nullptr; }
226226
virtual bool getFiles(std::string& /*files*/) { return false; }
@@ -235,7 +235,7 @@ struct Transport : IDebuggable, ITransportHeaders {
235235
/**
236236
* Is this a GET, POST or anything?
237237
*/
238-
virtual Method getMethod() = 0;
238+
virtual Method getMethod() override = 0;
239239
virtual const char *getExtendedMethod() { return nullptr;}
240240
const char *getMethodName() override;
241241

@@ -394,7 +394,7 @@ struct Transport : IDebuggable, ITransportHeaders {
394394
* foo/bar?x=1 command is "foo/bar"
395395
* /foo/bar?x=1 command is "foo/bar"
396396
*/
397-
std::string getCommand();
397+
std::string getCommand() override;
398398

399399
/**
400400
* Get value of a parameter. Returns empty string is not present.

0 commit comments

Comments
 (0)