aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/Support/Error.cpp
diff options
context:
space:
mode:
authorReid Kleckner <rnk@google.com>2016-03-24 23:49:34 +0000
committerReid Kleckner <rnk@google.com>2016-03-24 23:49:34 +0000
commita15b76b3774e6228bc4ea05851aa2425ca19f7c4 (patch)
tree60f967234c66c1055e2da85b53c340f6ad998350 /llvm/lib/Support/Error.cpp
parentd07268c52832948e7d8cd61b53312aa0e14e93f8 (diff)
downloadllvm-a15b76b3774e6228bc4ea05851aa2425ca19f7c4.zip
llvm-a15b76b3774e6228bc4ea05851aa2425ca19f7c4.tar.gz
llvm-a15b76b3774e6228bc4ea05851aa2425ca19f7c4.tar.bz2
Try to fix ODR violation of ErrorInfo::ID
This implements my suggestion to Lang. llvm-svn: 264360
Diffstat (limited to 'llvm/lib/Support/Error.cpp')
-rw-r--r--llvm/lib/Support/Error.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/llvm/lib/Support/Error.cpp b/llvm/lib/Support/Error.cpp
index 5bda6aa..9007e69 100644
--- a/llvm/lib/Support/Error.cpp
+++ b/llvm/lib/Support/Error.cpp
@@ -36,9 +36,8 @@ namespace {
void ErrorInfoBase::anchor() {}
char ErrorInfoBase::ID = 0;
-
-template <> char ErrorInfo<ErrorList>::ID = 0;
-template <> char ErrorInfo<ECError>::ID = 0;
+char ErrorList::ID = 0;
+char ECError::ID = 0;
static ManagedStatic<ErrorErrorCategory> ErrorErrorCat;