diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-10-08 15:43:58 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-10-08 22:50:17 +0000 |
| commit | 3ee8efdfea3492ca3c6a31dc89935dd70d8348b0 (patch) | |
| tree | 29997659f10ae1b2f1837cbe599a354764250c23 | |
| parent | d1ec1e85f8ff7800843952b69a196f0fa4e58f0e (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>
| -rw-r--r-- | ui/qt/simple_dialog.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/qt/simple_dialog.cpp b/ui/qt/simple_dialog.cpp index f25a653faf..2c04b86dd6 100644 --- a/ui/qt/simple_dialog.cpp +++ b/ui/qt/simple_dialog.cpp @@ -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) { |