diff options
author | Benjamin Kramer <benny.kra@googlemail.com> | 2017-05-29 14:28:04 +0000 |
---|---|---|
committer | Benjamin Kramer <benny.kra@googlemail.com> | 2017-05-29 14:28:04 +0000 |
commit | 2a441a52df82547051bbd4a41ff1bb6d89e1fafe (patch) | |
tree | da5620ee1a158497cb33af69a27f8e019216f1fe /llvm/lib/Support/Timer.cpp | |
parent | 351779e9720e520603325c5a44218016c1bc6192 (diff) | |
download | bcm5719-llvm-2a441a52df82547051bbd4a41ff1bb6d89e1fafe.tar.gz bcm5719-llvm-2a441a52df82547051bbd4a41ff1bb6d89e1fafe.zip |
Try to work around MSVC being buggy. Attempt #1.
error C2971: 'llvm::ManagedStatic': template parameter 'Creator': 'CreateDefaultTimerGroup': a variable with non-static storage duration cannot be used as a non-type argument
llvm-svn: 304157
Diffstat (limited to 'llvm/lib/Support/Timer.cpp')
-rw-r--r-- | llvm/lib/Support/Timer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/llvm/lib/Support/Timer.cpp b/llvm/lib/Support/Timer.cpp index 4cb04c164f0..ddcb057218d 100644 --- a/llvm/lib/Support/Timer.cpp +++ b/llvm/lib/Support/Timer.cpp @@ -72,9 +72,11 @@ std::unique_ptr<raw_fd_ostream> llvm::CreateInfoOutputFile() { return llvm::make_unique<raw_fd_ostream>(2, false); // stderr. } -static void *CreateDefaultTimerGroup() { +namespace { +void *CreateDefaultTimerGroup() { return new TimerGroup("misc", "Miscellaneous Ungrouped Timers"); } +} // namespace static ManagedStatic<TimerGroup, CreateDefaultTimerGroup> DefaultTimerGroup; static TimerGroup *getDefaultTimerGroup() { return &*DefaultTimerGroup; } |