]>
Commit | Line | Data |
---|---|---|
7c1add51 JB |
1 | --- glog-0.3.3/src/demangle_unittest.cc.orig 2012-01-11 10:14:17.000000000 +0100 |
2 | +++ glog-0.3.3/src/demangle_unittest.cc 2015-02-08 21:29:01.660388457 +0100 | |
3 | @@ -46,6 +46,7 @@ GLOG_DEFINE_bool(demangle_filter, false, | |
4 | ||
5 | using namespace std; | |
6 | using namespace GOOGLE_NAMESPACE; | |
7 | +using namespace gflags; | |
8 | ||
9 | // A wrapper function for Demangle() to make the unit test simple. | |
10 | static const char *DemangleIt(const char * const mangled) { | |
11 | --- glog-0.3.3/src/logging_unittest.cc.orig 2013-01-31 05:39:40.000000000 +0100 | |
12 | +++ glog-0.3.3/src/logging_unittest.cc 2015-02-08 21:24:53.070398888 +0100 | |
13 | @@ -79,6 +79,7 @@ using GOOGLE_NAMESPACE::glog_testing::Sc | |
14 | ||
15 | using namespace std; | |
16 | using namespace GOOGLE_NAMESPACE; | |
17 | +using namespace gflags; | |
18 | ||
19 | // Some non-advertised functions that we want to test or use. | |
20 | _START_GOOGLE_NAMESPACE_ | |
21 | --- glog-0.3.3/src/signalhandler_unittest.cc.orig 2012-01-11 10:14:17.000000000 +0100 | |
22 | +++ glog-0.3.3/src/signalhandler_unittest.cc 2015-02-08 21:30:07.120385709 +0100 | |
23 | @@ -42,6 +42,7 @@ | |
24 | #include "glog/logging.h" | |
25 | ||
26 | using namespace GOOGLE_NAMESPACE; | |
27 | +using namespace gflags; | |
28 | ||
29 | void* DieInThread(void*) { | |
30 | // We assume pthread_t is an integral number or a pointer, rather |