summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@ubuntu.com>2011-12-05 16:02:22 -0800
committerChase Douglas <chase.douglas@ubuntu.com>2011-12-05 16:02:22 -0800
commitad0ef22400f1b9960e15e0f6fe39b3e95701f21e (patch)
tree94a96451ff46bce04460ab826a8c5b5bcc832ec9 /include
parente10564038f99adee0a12cb028cac5bd1610d7b40 (diff)
Rename testing::xorg to xorg::testing
Prevents a possible collision with gtest's testing namespace
Diffstat (limited to 'include')
-rw-r--r--include/xorg/gtest/environment.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/xorg/gtest/environment.h b/include/xorg/gtest/environment.h
index caf2c08..7741229 100644
--- a/include/xorg/gtest/environment.h
+++ b/include/xorg/gtest/environment.h
@@ -23,8 +23,8 @@
#include <gtest/gtest.h>
-namespace testing {
namespace xorg {
+namespace testing {
/**
* @brief Dummy Xorg Google Test environment.
@@ -33,7 +33,7 @@ namespace xorg {
* display :133. Either associate the environment manually
* with the overall testing framework or link to libxtestingenvironment_main.a.
*/
-class Environment : public testing::Environment {
+class Environment : public ::testing::Environment {
public:
Environment(const std::string& pathToConf, int display = 133);
@@ -45,5 +45,5 @@ class Environment : public testing::Environment {
pid_t child_pid_;
};
-} // namespace xorg
} // namespace testing
+} // namespace xorg