Move DISSECTOR_ASSERT_FIELD_TYPE_IS_TIME after __DISSECTOR_ASSERT_FIELD_TYPE_IS_TIME().

That's consistent with the other DISSECTOR_ASSERT_FIELD_TYPE... macros.

Change-Id: I1f5711b29ae8a440b0529373eb7903ff122ea18e
Reviewed-on: https://code.wireshark.org/review/23681
Reviewed-by: Guy Harris <guy@alum.mit.edu>

diff --git a/epan/proto.h b/epan/proto.h
index 6981af8f04af45e4ff494ffabdaec12aafe2b8d2..816f1ce65bfdd29936b32723585583ba9f688b8d 100644 (file)
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -281,13 +281,6 @@ WS_DLL_PUBLIC WS_NORETURN void proto_report_dissector_bug(const char *message);
    __DISSECTOR_ASSERT_STATIC_ANALYSIS_HINT(IS_FT_INT((hfinfo)->type) || \
                                            IS_FT_UINT((hfinfo)->type))
 
-#define DISSECTOR_ASSERT_FIELD_TYPE_IS_TIME(hfinfo)  \
-  ((void) (((hfinfo)->type == FT_ABSOLUTE_TIME || \
-            (hfinfo)->type == FT_RELATIVE_TIME) ? (void)0 : \
-   __DISSECTOR_ASSERT_FIELD_TYPE_IS_TIME ((hfinfo)))) \
-   __DISSECTOR_ASSERT_STATIC_ANALYSIS_HINT((hfinfo)->type == FT_ABSOLUTE_TIME || \
-                                           (hfinfo)->type == FT_RELATIVE_TIME)
-
 #define __DISSECTOR_ASSERT_FIELD_TYPE_IS_STRING(hfinfo) \
   (REPORT_DISSECTOR_BUG( \
     wmem_strdup_printf(wmem_packet_scope(), \
@@ -308,6 +301,13 @@ WS_DLL_PUBLIC WS_NORETURN void proto_report_dissector_bug(const char *message);
         "%s:%u: field %s is not of type FT_ABSOLUTE_TIME or FT_RELATIVE_TIME", \
         __FILE__, __LINE__, (hfinfo)->abbrev)))
 
+#define DISSECTOR_ASSERT_FIELD_TYPE_IS_TIME(hfinfo)  \
+  ((void) (((hfinfo)->type == FT_ABSOLUTE_TIME || \
+            (hfinfo)->type == FT_RELATIVE_TIME) ? (void)0 : \
+   __DISSECTOR_ASSERT_FIELD_TYPE_IS_TIME ((hfinfo)))) \
+   __DISSECTOR_ASSERT_STATIC_ANALYSIS_HINT((hfinfo)->type == FT_ABSOLUTE_TIME || \
+                                           (hfinfo)->type == FT_RELATIVE_TIME)
+
 /*
  * The encoding of a field of a particular type may involve more
  * than just whether it's big-endian or little-endian and its size.