git.samba.org / metze / wireshark / wip.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d1ec1e8) | patch
Be less lazy about disabling a Visual C++ warning.
authorGerald Combs <gerald@wireshark.org>
Wed, 8 Oct 2014 22:43:58 +0000 (15:43 -0700)
committerGerald Combs <gerald@wireshark.org>
Wed, 8 Oct 2014 22:50:17 +0000 (22:50 +0000)
commit3ee8efdfea3492ca3c6a31dc89935dd70d8348b0
tree29997659f10ae1b2f1837cbe599a354764250c23tree
parentd1ec1e85f8ff7800843952b69a196f0fa4e58f0ecommit | diff
Be less lazy about disabling a Visual C++ warning.

As Graham pointed out, "#pragma warning(disable..." affects the rest
of the file. Add a push+pop so that we only operate on the line in
question. Ideally we'd be able to use "suppress" but an "#endif"
prevents that.

Change-Id: Ia01d6c245879f1c845dc68c18caea2cbceb273ef
Reviewed-on: https://code.wireshark.org/review/4569
Reviewed-by: Gerald Combs <gerald@wireshark.org>
ui/qt/simple_dialog.cpp diff | blob | history
Unnamed repository; edit this file to name it for gitweb.