|
@@ -166,17 +166,17 @@ void fun2() {
|
|
|
}
|
|
|
|
|
|
void fun3(void* arg) {
|
|
|
- get_oss() << "fun3(" << arg << ")" << std::endl;
|
|
|
+ get_oss() << "fun3(" << (uintptr_t)arg << ")" << std::endl;
|
|
|
}
|
|
|
|
|
|
void fun4(void* arg) {
|
|
|
- get_oss() << "fun4(" << arg << ")" << std::endl;
|
|
|
+ get_oss() << "fun4(" << (uintptr_t)arg << ")" << std::endl;
|
|
|
}
|
|
|
|
|
|
static void check_result() {
|
|
|
// Don't use gtest function since this function might be invoked when the main
|
|
|
// thread quits, instances required by gtest functions are likely destroyed.
|
|
|
- assert (get_oss().str() == "fun4(0)\nfun3(0x2)\nfun2\n");
|
|
|
+ assert(get_oss().str() == "fun4(0)\nfun3(2)\nfun2\n");
|
|
|
}
|
|
|
|
|
|
TEST_F(BaiduThreadLocalTest, call_order_and_cancel) {
|