diff options
| author | Joseph Henry <[email protected]> | 2017-05-30 13:11:43 -0700 |
|---|---|---|
| committer | Joseph Henry <[email protected]> | 2017-05-30 13:11:43 -0700 |
| commit | 673d1b9a095025368177088bbf6875d7d3057f2f (patch) | |
| tree | 3291ad3a81fb076055e7bf173b5766ccdca675be /zto/node/Packet.cpp | |
| parent | 5cfb4c38ef2ab3a3621bf568db6bb2b2bd83a357 (diff) | |
updated ZTO core1.1.2
Diffstat (limited to 'zto/node/Packet.cpp')
| -rw-r--r-- | zto/node/Packet.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zto/node/Packet.cpp b/zto/node/Packet.cpp index d60a3a3..6e1b36a 100644 --- a/zto/node/Packet.cpp +++ b/zto/node/Packet.cpp @@ -320,6 +320,7 @@ union LZ4_streamDecode_u { #define FORCE_INLINE static inline #endif +#if 0 #if (defined(__GNUC__) && (__GNUC__ >= 3)) || (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 800)) || defined(__clang__) # define expect(expr,value) (__builtin_expect ((expr),(value)) ) #else @@ -328,6 +329,7 @@ union LZ4_streamDecode_u { #define likely(expr) expect((expr) != 0, 1) #define unlikely(expr) expect((expr) != 0, 0) +#endif /*-************************************ * Memory routines @@ -1080,8 +1082,6 @@ const char *Packet::verbString(Verb v) case VERB_MULTICAST_GATHER: return "MULTICAST_GATHER"; case VERB_MULTICAST_FRAME: return "MULTICAST_FRAME"; case VERB_PUSH_DIRECT_PATHS: return "PUSH_DIRECT_PATHS"; - case VERB_CIRCUIT_TEST: return "CIRCUIT_TEST"; - case VERB_CIRCUIT_TEST_REPORT: return "CIRCUIT_TEST_REPORT"; case VERB_USER_MESSAGE: return "USER_MESSAGE"; } return "(unknown)"; |