summaryrefslogtreecommitdiff
path: root/libraries/glog/glog.patch
blob: 7d3e50c5079a085fe08822fd6952d5fb19c2fe1e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
diff -Naur glog-0.3.3/src/demangle_unittest.cc glog-0.3.3-patched/src/demangle_unittest.cc
--- glog-0.3.3/src/demangle_unittest.cc	2012-01-11 04:14:17.000000000 -0500
+++ glog-0.3.3-patched/src/demangle_unittest.cc	2014-04-24 12:13:53.967735046 -0400
@@ -41,6 +41,11 @@
 #include "googletest.h"
 #include "config.h"
 
+#ifdef HAVE_LIB_GFLAGS
+#include <gflags/gflags.h>
+using namespace gflags;
+#endif
+
 GLOG_DEFINE_bool(demangle_filter, false,
                  "Run demangle_unittest in filter mode");
 
diff -Naur glog-0.3.3/src/logging_unittest.cc glog-0.3.3-patched/src/logging_unittest.cc
--- glog-0.3.3/src/logging_unittest.cc	2013-01-30 23:39:40.000000000 -0500
+++ glog-0.3.3-patched/src/logging_unittest.cc	2014-04-24 12:12:11.977883984 -0400
@@ -61,6 +61,7 @@
 
 #ifdef HAVE_LIB_GFLAGS
 #include <gflags/gflags.h>
+using namespace gflags;
 #endif
 
 #ifdef HAVE_LIB_GMOCK
diff -Naur glog-0.3.3/src/signalhandler_unittest.cc glog-0.3.3-patched/src/signalhandler_unittest.cc
--- glog-0.3.3/src/signalhandler_unittest.cc	2012-01-11 04:14:17.000000000 -0500
+++ glog-0.3.3-patched/src/signalhandler_unittest.cc	2014-04-24 12:15:14.976822615 -0400
@@ -41,6 +41,11 @@
 #include <string>
 #include "glog/logging.h"
 
+#ifdef HAVE_LIB_GFLAGS
+#include <gflags/gflags.h>
+using namespace gflags;
+#endif
+
 using namespace GOOGLE_NAMESPACE;
 
 void* DieInThread(void*) {
diff -Naur glog-0.3.3/src/symbolize_unittest.cc glog-0.3.3-patched/src/symbolize_unittest.cc
--- glog-0.3.3/src/symbolize_unittest.cc	2012-01-11 04:14:17.000000000 -0500
+++ glog-0.3.3-patched/src/symbolize_unittest.cc	2014-04-24 12:14:18.077463477 -0400
@@ -41,6 +41,11 @@
 #include "googletest.h"
 #include "config.h"
 
+#ifdef HAVE_LIB_GFLAGS
+#include <gflags/gflags.h>
+using namespace gflags;
+#endif
+
 using namespace std;
 using namespace GOOGLE_NAMESPACE;
 
diff -Naur glog-0.3.3/src/utilities_unittest.cc glog-0.3.3-patched/src/utilities_unittest.cc
--- glog-0.3.3/src/utilities_unittest.cc	2012-01-11 04:14:17.000000000 -0500
+++ glog-0.3.3-patched/src/utilities_unittest.cc	2014-04-24 12:14:54.963048001 -0400
@@ -33,6 +33,11 @@
 #include "googletest.h"
 #include "glog/logging.h"
 
+#ifdef HAVE_LIB_GFLAGS
+#include <gflags/gflags.h>
+using namespace gflags;
+#endif
+
 using namespace GOOGLE_NAMESPACE;
 
 TEST(utilities, sync_val_compare_and_swap) {