aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/capture_file.h
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2017-12-27 21:05:40 +0000
committerMichael Mann <mmann78@netscape.net>2017-12-27 22:50:12 +0000
commit9715aff0bd9c84a76e0dd364829cecde2a8a3610 (patch)
treebb065e970e64a79dcaecbf4bd45ba7ad6a10f9ec /ui/qt/capture_file.h
parent3939ebe2738f85962d2a6152174d6e555aa82ff0 (diff)
capture_file(.h): fix commas at the end of enumerator lists are a C++11 extension [-Wc++11-extensions]
Change-Id: I64c9fdefcf72add83944a6c38d5aa4e42dbaacb9 Reviewed-on: https://code.wireshark.org/review/25017 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/qt/capture_file.h')
-rw-r--r--ui/qt/capture_file.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/qt/capture_file.h b/ui/qt/capture_file.h
index 9f48638ec3..7ae6118340 100644
--- a/ui/qt/capture_file.h
+++ b/ui/qt/capture_file.h
@@ -48,7 +48,7 @@ public:
Rescan = 0x0200 | File,
Save = 0x0400 | File,
Retap = 0x0800 | File,
- Merge = 0x1000 | File,
+ Merge = 0x1000 | File
};
enum EventType {