osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Gerald Combs 2014-10-08 15:43:58 -07:00
parent d1ec1e85f8
commit 3ee8efdfea
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/qt/simple_dialog.cpp
View File

@ -47,10 +47,14 @@ QList<MessagePair> message_queue_;
ESD_TYPE_E max_severity_ = ESD_TYPE_INFO;
#ifdef _MSC_VER
#pragma warning(push)
// Disable "warning C4566: character represented by universal-character-name '\uFFFF' cannot be represented in the current code page (1252)"
#pragma warning(disable:4566)
#endif
const char *primary_delimiter_ = "\uffff";
#ifdef _MSC_VER
#pragma warning(pop)
#endif
const char *
simple_dialog_primary_start(void) {