projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-188
[awesomized/libmemcached]
/
libtest
/
fatal.hpp
diff --git
a/libtest/fatal.hpp
b/libtest/fatal.hpp
index bc288afeb767cf72498ee86348364dc830c5039f..8b810e7bb44189106ed4c4658bbfafaf830ab557 100644
(file)
--- a/
libtest/fatal.hpp
+++ b/
libtest/fatal.hpp
@@
-38,22
+38,16
@@
#include <stdexcept>
#include <stdexcept>
-#ifndef __PRETTY_FUNCTION__
-#define __PRETTY_FUNCTION__ __func__
-#endif
-
-#define LIBYATL_DEFAULT_PARAM __FILE__, __LINE__, __PRETTY_FUNCTION__
-
namespace libtest {
namespace libtest {
-class
fatal
: std::runtime_error
+class
disconnected
: std::runtime_error
{
public:
{
public:
-
fatal(const char *file, int line, const char *func, const char *forma
t, ...);
+
disconnected(const char *file, int line, const char *func, const std::string&, const in_port_t por
t, ...);
const char* what() const throw()
{
const char* what() const throw()
{
- return
_error_message
;
+ return
&_error_message[0]
;
}
// The following are just for unittesting the exception class
}
// The following are just for unittesting the exception class
@@
-63,35
+57,28
@@
public:
static uint32_t disabled_counter();
static void increment_disabled_counter();
static uint32_t disabled_counter();
static void increment_disabled_counter();
-private:
- char _error_message[BUFSIZ];
-};
-
-class disconnected : std::runtime_error
-{
-public:
- disconnected(const char *file, int line, const char *func, const char *instance, const in_port_t port, const char *format, ...);
+ int line()
+ {
+ return _line;
+ }
- const char*
what() const throw
()
+ const char*
file
()
{
{
- return _
error_messag
e;
+ return _
fil
e;
}
}
- // The following are just for unittesting the exception class
- static bool is_disabled();
- static void disable();
- static void enable();
- static uint32_t disabled_counter();
- static void increment_disabled_counter();
+ const char* func()
+ {
+ return _func;
+ }
private:
char _error_message[BUFSIZ];
in_port_t _port;
char _instance[1024];
private:
char _error_message[BUFSIZ];
in_port_t _port;
char _instance[1024];
+ int _line;
+ const char* _file;
+ const char* _func;
};
};
-
} // namespace libtest
} // namespace libtest
-
-#define fatal_message(__mesg) throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "%s", __mesg)
-#define fatal_assert(__assert) if((__assert)) {} else { throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "%s", #__assert); }