summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/tools/flip_server/http_interface.h2
-rw-r--r--tools/clang/plugins/ChromeClassTester.cpp6
2 files changed, 6 insertions, 2 deletions
diff --git a/net/tools/flip_server/http_interface.h b/net/tools/flip_server/http_interface.h
index fa9ceb4..78d3dca 100644
--- a/net/tools/flip_server/http_interface.h
+++ b/net/tools/flip_server/http_interface.h
@@ -69,7 +69,7 @@ class HttpSM : public BalsaVisitorInterface,
void AddToOutputOrder(const MemCacheIter& mci);
void SendOKResponse(uint32 stream_id, std::string* output);
BalsaFrame* spdy_framer() { return http_framer_; }
- void set_is_request() {}
+ virtual void set_is_request() {}
// SMInterface:
virtual void InitSMInterface(SMInterface* sm_spdy_interface,
diff --git a/tools/clang/plugins/ChromeClassTester.cpp b/tools/clang/plugins/ChromeClassTester.cpp
index 964d2c6..732da68 100644
--- a/tools/clang/plugins/ChromeClassTester.cpp
+++ b/tools/clang/plugins/ChromeClassTester.cpp
@@ -166,7 +166,11 @@ void ChromeClassTester::emitWarning(SourceLocation loc, const char* raw_error) {
std::string err;
err = "[chromium-style] ";
err += raw_error;
- unsigned id = diagnostic().getCustomDiagID(Diagnostic::Warning, err);
+ Diagnostic::Level level =
+ diagnostic().getWarningsAsErrors() ?
+ Diagnostic::Error :
+ Diagnostic::Warning;
+ unsigned id = diagnostic().getCustomDiagID(level, err);
DiagnosticBuilder B = diagnostic().Report(full, id);
}