diff options
author | Reid Kleckner <rnk@google.com> | 2016-03-24 23:49:34 +0000 |
---|---|---|
committer | Reid Kleckner <rnk@google.com> | 2016-03-24 23:49:34 +0000 |
commit | a15b76b3774e6228bc4ea05851aa2425ca19f7c4 (patch) | |
tree | 60f967234c66c1055e2da85b53c340f6ad998350 /llvm/docs/ProgrammersManual.rst | |
parent | d07268c52832948e7d8cd61b53312aa0e14e93f8 (diff) | |
download | bcm5719-llvm-a15b76b3774e6228bc4ea05851aa2425ca19f7c4.tar.gz bcm5719-llvm-a15b76b3774e6228bc4ea05851aa2425ca19f7c4.zip |
Try to fix ODR violation of ErrorInfo::ID
This implements my suggestion to Lang.
llvm-svn: 264360
Diffstat (limited to 'llvm/docs/ProgrammersManual.rst')
-rw-r--r-- | llvm/docs/ProgrammersManual.rst | 3 |
1 files changed, 3 insertions, 0 deletions
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"); |