diff options
| author | Wu, Ke <wuke@cs.umd.edu> | 2014-12-17 16:11:38 -0500 | 
|---|---|---|
| committer | Wu, Ke <wuke@cs.umd.edu> | 2014-12-17 16:11:38 -0500 | 
| commit | 7468e8d85e99b4619442c7afaf4a0d92870111bb (patch) | |
| tree | a6f17da7c69048c8900260b5490bb9d8611be3bb /klm/util/exception.hh | |
| parent | b6dd5a683db9dda2d634dd2fdb76606819594901 (diff) | |
| parent | 1a79175f9a101d46cf27ca921213d5dd9300518f (diff) | |
Merge with upstream
Diffstat (limited to 'klm/util/exception.hh')
| -rw-r--r-- | klm/util/exception.hh | 9 | 
1 files changed, 6 insertions, 3 deletions
| diff --git a/klm/util/exception.hh b/klm/util/exception.hh index 0298272b..4e50a6f3 100644 --- a/klm/util/exception.hh +++ b/klm/util/exception.hh @@ -1,5 +1,5 @@ -#ifndef UTIL_EXCEPTION__ -#define UTIL_EXCEPTION__ +#ifndef UTIL_EXCEPTION_H +#define UTIL_EXCEPTION_H  #include <exception>  #include <limits> @@ -83,6 +83,9 @@ template <class Except, class Data> typename Except::template ExceptionTag<Excep  #define UTIL_THROW(Exception, Modify) \    UTIL_THROW_BACKEND(NULL, Exception, , Modify); +#define UTIL_THROW2(Modify) \ +  UTIL_THROW_BACKEND(NULL, util::Exception, , Modify); +  #if __GNUC__ >= 3  #define UTIL_UNLIKELY(x) __builtin_expect (!!(x), 0)  #else @@ -143,4 +146,4 @@ inline std::size_t CheckOverflow(uint64_t value) {  } // namespace util -#endif // UTIL_EXCEPTION__ +#endif // UTIL_EXCEPTION_H | 
