diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-10-12 03:00:04 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-10-12 03:00:04 +0000 |
| commit | 73353437ced7086dd5e91810bedf948b06f5e489 (patch) | |
| tree | 1093d35b20421f1087308f68561aa0375e6defe4 /wsutil/str_util.h | |
| parent | 6e3892e43a18a18078814c04fc8469f9295fadc8 (diff) | |
| download | wireshark-73353437ced7086dd5e91810bedf948b06f5e489.tar.gz | |
Another Solaris Studio C++ fix.
svn path=/trunk/; revision=52561
Diffstat (limited to 'wsutil/str_util.h')
| -rw-r--r-- | wsutil/str_util.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/wsutil/str_util.h b/wsutil/str_util.h index f14c8a26e0..505bb9088d 100644 --- a/wsutil/str_util.h +++ b/wsutil/str_util.h @@ -94,11 +94,6 @@ typedef enum { /* XXX format_size_prefix_default_for_this_particular_os ? */ } format_size_flags_e; -#ifdef __cplusplus -/* Should we just have separate unit and prefix enums instead? */ -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 * * Prefixes up to "T/Ti" (tera, tebi) are currently supported. @@ -114,6 +109,9 @@ gchar *format_size(gint64 size, format_size_flags_e flags); #ifdef __cplusplus } + +/* Should we just have separate unit and prefix enums instead? */ +extern format_size_flags_e operator|(format_size_flags_e lhs, format_size_flags_e rhs); #endif /* __cplusplus */ #endif /* __STR_UTIL_H__ */ |