abs fix

Signed-off-by: imarom <[email protected]>

diff --git a/src/common/captureFile.cpp b/src/common/captureFile.cpp
index b3035e8..a25d1c4 100755 (executable)
--- a/src/common/captureFile.cpp
+++ b/src/common/captureFile.cpp
@@ -135,7 +135,7 @@ bool CCapPktRaw::Compare(CCapPktRaw * obj,int dump,double dsec){
     CPktNsecTimeStamp t2(obj->time_sec,obj->time_nsec);
     if ( t1.diff(t2) > dsec ){
         if ( dump ){
-            printf(" ERROR: diff of 1 msec in time  \n");
+            printf(" ERROR: diff of %lf seconds while only %lf allowed\n", t1.diff(t2), dsec);
         }
         return (false);
     }

diff --git a/src/common/captureFile.h b/src/common/captureFile.h
index d87e57b..a552d50 100755 (executable)
--- a/src/common/captureFile.h
+++ b/src/common/captureFile.h
@@ -25,6 +25,7 @@ limitations under the License.
 #include <stdlib.h>
 #include <string>
 #include <iostream>
+#include <cmath>
 
 #ifdef WIN32
 #pragma warning(disable:4786)
@@ -87,7 +88,7 @@ public:
     }
 
     double diff(const CPktNsecTimeStamp & obj){
-        return (abs(getNsec() - obj.getNsec() ) );
+        return (std::abs(getNsec() - obj.getNsec() ) );
     }
 
     void Dump(FILE *fd);

diff --git a/src/gtest/bp_timer_gtest.cpp b/src/gtest/bp_timer_gtest.cpp
index 1e8e706..70e5e19 100644 (file)
--- a/src/gtest/bp_timer_gtest.cpp
+++ b/src/gtest/bp_timer_gtest.cpp
@@ -23,7 +23,7 @@ limitations under the License.
 #include <common/basic_utils.h>
 #include "h_timer.h"
 #include <common/utl_gcc_diag.h>
-
+#include <cmath>
 
 
 class gt_r_timer  : public testing::Test {
@@ -711,7 +711,7 @@ void CNATimerWheelTest1::on_tick(CMyTestObject *lpobj){
         if (expect_min>m_div_err) {
             expect_min-=m_div_err*2;
         }
-        double pre=abs(100.0-100.0*(double)m_ticks/(double)m_expect_tick);
+        double pre=std::abs(100.0-100.0*(double)m_ticks/(double)m_expect_tick);
         if (pre>m_max_err){
             m_max_err=pre;
         }
@@ -1051,7 +1051,7 @@ void CNATimerWheelTest2::on_tick(CMyTestObject *lp){
     }
     m_timer.timer_start(&lp->m_timer,lp->m_d_tick);
     if (!m_cfg.m_dont_check){
-        double pre=abs(100.0-100.0*(double)m_ticks/(double)lp->m_t_tick);
+        double pre=std::abs(100.0-100.0*(double)m_ticks/(double)lp->m_t_tick);
         if (pre>(200.0/(double)m_div_err)) {
             printf(" =====>tick:%d  %f \n",m_ticks,pre);
             assert(0);

diff --git a/src/utl_yaml.cpp b/src/utl_yaml.cpp
index a4fd640..df60596 100755 (executable)
--- a/src/utl_yaml.cpp
+++ b/src/utl_yaml.cpp
@@ -313,6 +313,7 @@ YAMLParserWrapper::parse_mac_addr(const YAML::Node &node, const std::string &nam
     }
 
     assert(0);
+    return(0);
 }
 
 uint64_t