Merge remote-tracking branch 'origin/develop' into agent-performance

2016-04-04 10:49:35 +01:00
parent a226423258 f545a225a4
commit 224ec7c4a1
114 changed files with 758 additions and 314 deletions
@@ -706,6 +706,10 @@ void logRecord_mt(const char *file, const char *func, int line, int comp,
  char *log_start;
  char *log_end;

+  /* for no gcc warnings */
+  (void)log_start;
+  (void)log_end;
+
  c = &g_log->log_component[comp];

  // do not apply filtering for LOG_F
@@ -979,6 +983,10 @@ void logRecord_mt(const char *file, const char *func, int line, int comp,
   */
  char log_buffer[MAX_LOG_TOTAL];

+  /* for no gcc warnings */
+  (void)log_start;
+  (void)log_end;
+
  c = &g_log->log_component[comp];

  // do not apply filtering for LOG_F