diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-10-19 19:04:21 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-10-19 19:04:21 +0000 |
| commit | b369a09cd2f6bd6a308194e8bfa40384ebbb2d3c (patch) | |
| tree | 98ca40bd7bfd87603c187c19bd228a0486cbb6b3 /wsutil/str_util.h | |
| parent | ebaf451a4e9d98256802652bd4dd0b23f492c5f0 (diff) | |
| download | wireshark-b369a09cd2f6bd6a308194e8bfa40384ebbb2d3c.tar.gz | |
The file set and export object trees are lists. Make them act like
it. Show human-readable sizes in the file set dialog. Move the
format_size_flags_e operator to qt_ui_utils.cpp for lack of a better
place.
svn path=/trunk/; revision=45661
Diffstat (limited to 'wsutil/str_util.h')
| -rw-r--r-- | wsutil/str_util.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/wsutil/str_util.h b/wsutil/str_util.h index 302afd0096..40ca44ed02 100644 --- a/wsutil/str_util.h +++ b/wsutil/str_util.h @@ -90,9 +90,7 @@ typedef enum { #ifdef __cplusplus /* Should we just have separate unit and prefix enums instead? */ -format_size_flags_e operator|(format_size_flags_e lhs, format_size_flags_e rhs) { - return (format_size_flags_e) ((int)lhs| (int)rhs); -} +extern format_size_flags_e operator|(format_size_flags_e lhs, format_size_flags_e rhs); #endif /* __cplusplus */ /** Given a size, return its value in a human-readable format |