summaryrefslogtreecommitdiff
path: root/test/test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-03-09 16:45:26 +0100
committerCarl Hetherington <cth@carlh.net>2020-03-11 22:24:28 +0100
commit5ff6b15ef3c58a046fb9eec0273c5e7322988a14 (patch)
tree26740a36eea1d61aeb62445671c4c2f3a8017de9 /test/test.cc
parentffe35585f08d0a5aeccf3e32f9c4cd2a5a6f43f5 (diff)
Move private_data into TestPaths
Diffstat (limited to 'test/test.cc')
-rw-r--r--test/test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/test.cc b/test/test.cc
index b111a3b6b..8f92024fc 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -71,7 +71,7 @@ using boost::shared_ptr;
using boost::scoped_array;
using boost::dynamic_pointer_cast;
-boost::filesystem::path private_data = boost::filesystem::canonical(boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private"));
+boost::filesystem::path TestPaths::TestPaths::private_data = boost::filesystem::canonical(boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private"));
boost::filesystem::path TestPaths::xsd = boost::filesystem::canonical(boost::filesystem::path("..") / boost::filesystem::path("libdcp") / boost::filesystem::path("xsd"));
void
@@ -114,7 +114,7 @@ struct TestConfig
char* env_private = getenv("DCPOMATIC_TEST_PRIVATE");
if (env_private) {
- private_data = env_private;
+ TestPaths::TestPaths::private_data = env_private;
}
dcpomatic_log.reset (new FileLog("build/test/log"));