diff options
Diffstat (limited to 'lib/common/BoxException.h')
| -rw-r--r-- | lib/common/BoxException.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/common/BoxException.h b/lib/common/BoxException.h index a8f5d7a6..ad5aba4f 100644 --- a/lib/common/BoxException.h +++ b/lib/common/BoxException.h @@ -29,6 +29,10 @@ public: virtual unsigned int GetType() const throw() = 0; virtual unsigned int GetSubType() const throw() = 0; +<<<<<<< HEAD +======= + virtual const std::string& GetMessage() const = 0; +>>>>>>> 0.12 private: }; |