From a15b76b3774e6228bc4ea05851aa2425ca19f7c4 Mon Sep 17 00:00:00 2001
From: Reid Kleckner <rnk@google.com>
Date: Thu, 24 Mar 2016 23:49:34 +0000
Subject: Try to fix ODR violation of ErrorInfo::ID

This implements my suggestion to Lang.

llvm-svn: 264360
---
 llvm/docs/ProgrammersManual.rst | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'llvm/docs/ProgrammersManual.rst')

diff --git a/llvm/docs/ProgrammersManual.rst b/llvm/docs/ProgrammersManual.rst
index 37792255937..32145550fe2 100644
--- a/llvm/docs/ProgrammersManual.rst
+++ b/llvm/docs/ProgrammersManual.rst
@@ -342,10 +342,13 @@ that inherits from the ErrorInfo utility:
   public:
     MyError(std::string Msg) : Msg(Msg) {}
     void log(OStream &OS) const override { OS << "MyError - " << Msg; }
+    static char ID;
   private:
     std::string Msg;
   };
 
+  char MyError::ID = 0; // In MyError.cpp
+
   Error bar() {
     if (checkErrorCondition)
       return make_error<MyError>("Error condition detected");
-- 
cgit v1.2.3