summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoretienneb@chromium.org <etienneb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-03 02:58:36 +0000
committeretienneb@chromium.org <etienneb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-03 02:58:36 +0000
commit89bf19e92321c7761a9722bfce8bbdac92ce0084 (patch)
tree109a10686ce2394b5f314e69cf318426e91c21b5
parenta179081b086a0532d0250b73c66dac18af729693 (diff)
downloadchromium_src-89bf19e92321c7761a9722bfce8bbdac92ce0084.zip
chromium_src-89bf19e92321c7761a9722bfce8bbdac92ce0084.tar.gz
chromium_src-89bf19e92321c7761a9722bfce8bbdac92ce0084.tar.bz2
Fix invalid use of pragma disable/default.
This issue was found by a linter. R=wtc@chromium.org BUG= Review URL: https://chromiumcodereview.appspot.com/21877008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215466 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--net/base/winsock_util.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/base/winsock_util.cc b/net/base/winsock_util.cc
index 8a4083a..5e5c312 100644
--- a/net/base/winsock_util.cc
+++ b/net/base/winsock_util.cc
@@ -13,6 +13,7 @@ namespace {
// Prevent the compiler from optimizing away the arguments so they appear
// nicely on the stack in crash dumps.
+#pragma warning(push)
#pragma warning (disable: 4748)
#pragma optimize( "", off )
@@ -28,7 +29,7 @@ void CheckEventWait(WSAEVENT hEvent, DWORD wait_rv, DWORD expected) {
}
#pragma optimize( "", on )
-#pragma warning (default: 4748)
+#pragma warning(pop)
net::PlatformSocketFactory* g_socket_factory = NULL;