diff options
| -rw-r--r-- | chrome/renderer/net/render_dns_master.cc | 5 | ||||
| -rw-r--r-- | chrome/renderer/renderer.scons | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/chrome/renderer/net/render_dns_master.cc b/chrome/renderer/net/render_dns_master.cc index 736c81e..beacec6 100644 --- a/chrome/renderer/net/render_dns_master.cc +++ b/chrome/renderer/net/render_dns_master.cc @@ -28,10 +28,7 @@ static const size_t kMAX_SUBMISSION_PER_TASK = 30; RenderDnsMaster::RenderDnsMaster() : c_string_queue_(1000), -#pragma warning(push) -#pragma warning(suppress: 4355) // Okay to pass "this" here. - render_dns_factory_(this) { -#pragma warning(pop) + ALLOW_THIS_IN_INITIALIZER_LIST(render_dns_factory_(this)) { Reset(); } diff --git a/chrome/renderer/renderer.scons b/chrome/renderer/renderer.scons index 30b5b0e..b799929 100644 --- a/chrome/renderer/renderer.scons +++ b/chrome/renderer/renderer.scons @@ -102,7 +102,6 @@ if env.Bit('linux'): 'chrome_plugin_host.cc', 'debug_message_handler.cc', 'external_js_object.cc', - 'net/render_dns_master.cc', 'plugin_channel_host.cc', 'render_view.cc', 'render_widget.cc', |