Kaydet (Commit) 41602324 authored tarafından Michael Stahl's avatar Michael Stahl

vcl: C++11 is awesome, they said! it's a whole new language, they said!

Change-Id: I96f00bd00ffcfea8ca026aacbaacf9539e327eff
üst 09a77cea
......@@ -818,8 +818,21 @@ namespace {
}
WatchdogTimings::WatchdogTimings()
: maTimingValues{{{6, 20} /* 1.5s, 5s */, {20, 120} /* 5s, 30s */,
{60, 240} /* 15s, 60s */, {60, 240} /* 15s, 60s */}}
: maTimingValues
#ifdef _MSC_VER
// note: Apple clang's parser segfaults on this
(
#else
// note: MSVC 2013 can't parse this, error C2797
{
#endif
{{6, 20} /* 1.5s, 5s */, {20, 120} /* 5s, 30s */,
{60, 240} /* 15s, 60s */, {60, 240} /* 15s, 60s */}
#ifdef _MSC_VER
)
#else
}
#endif
, mbRelaxed(false)
{
}
......
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