Commit 3456e30b authored by Mukund Sivaraman's avatar Mukund Sivaraman
Browse files

[2850] Don't declare a global static std::string object to avoid init fiasco

parent 4325f3df
......@@ -28,7 +28,7 @@ using boost::scoped_ptr;
namespace {
const std::string mapped_file = TEST_DATA_BUILDDIR "/test.mapped";
const char* mapped_file = TEST_DATA_BUILDDIR "/test.mapped";
class ZoneTableSegmentMappedTest : public ::testing::Test {
protected:
......@@ -36,7 +36,8 @@ protected:
ztable_segment_(
ZoneTableSegment::create(RRClass::IN(), "mapped")),
config_params_(
Element::fromJSON("{\"mapped-file\": \"" + mapped_file + "\"}"))
Element::fromJSON(
"{\"mapped-file\": \"" + std::string(mapped_file) + "\"}"))
{
EXPECT_NE(static_cast<void*>(NULL), ztable_segment_);
// Verify that a ZoneTableSegmentMapped is created.
......@@ -47,7 +48,7 @@ protected:
~ZoneTableSegmentMappedTest() {
ZoneTableSegment::destroy(ztable_segment_);
boost::interprocess::file_mapping::remove(mapped_file.c_str());
boost::interprocess::file_mapping::remove(mapped_file);
}
ZoneTableSegment* ztable_segment_;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment