From 981ca0fa022524fd04af988bc798f2d697d31548 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期三, 19 五月 2021 14:33:10 +0800
Subject: [PATCH] hide .so symbols, avoid 2+ protobuf link conflict.
---
utest/util.h | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/utest/util.h b/utest/util.h
index 7f41da9..23463e2 100644
--- a/utest/util.h
+++ b/utest/util.h
@@ -20,8 +20,8 @@
#define UTIL_W8A0OA5U
#include "bh_util.h"
+#include "shm.h"
#include "topic_node.h"
-#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/noncopyable.hpp>
#include <boost/test/unit_test.hpp>
#include <boost/timer/timer.hpp>
@@ -33,15 +33,15 @@
#include <thread>
#include <vector>
-using namespace boost::posix_time;
-inline ptime Now() { return second_clock::universal_time(); };
-
using namespace std::chrono_literals;
+using namespace std::chrono;
template <class D>
-inline void Sleep(D d)
+inline void Sleep(D d, bool print = true)
{
- printf("sleep for %ld ms\n", std::chrono::duration_cast<std::chrono::milliseconds>(d).count());
+ if (print) {
+ printf("sleep for %ld ms\n", std::chrono::duration_cast<std::chrono::milliseconds>(d).count());
+ }
std::this_thread::sleep_for(d);
}
@@ -131,4 +131,6 @@
}
};
+bhome_shm::SharedMemory &TestShm();
+
#endif // end of include guard: UTIL_W8A0OA5U
--
Gitblit v1.8.0