Browse Source

"Fix" for duplicate symbols w libdevcore/Common*

cl-refactor
subtly 10 years ago
parent
commit
8447f35608
  1. 16
      libdevcore/Common.cpp
  2. 13
      libdevcore/Common.h

16
libdevcore/Common.cpp

@ -29,5 +29,21 @@ namespace dev
char const* Version = "0.7.3";
#if defined(__GNUC__)
__attribute__((gnu_inline, always_inline))
#endif
inline bool assertAux(bool _a, char const* _aStr, unsigned _line, char const* _file, char const* _func)
{
bool ret = _a;
if (!ret)
{
std::cerr << "Assertion failed:" << _aStr << " [func=" << _func << ", line=" << _line << ", file=" << _file << "]" << std::endl;
#if ETH_DEBUG
debug_break();
#endif
}
return !ret;
}
}

13
libdevcore/Common.h

@ -120,18 +120,7 @@ inline unsigned int toLog2(u256 _x)
#if defined(__GNUC__)
__attribute__((gnu_inline, always_inline))
#endif
inline bool assertAux(bool _a, char const* _aStr, unsigned _line, char const* _file, char const* _func)
{
bool ret = _a;
if (!ret)
{
std::cerr << "Assertion failed:" << _aStr << " [func=" << _func << ", line=" << _line << ", file=" << _file << "]" << std::endl;
#if ETH_DEBUG
debug_break();
#endif
}
return !ret;
}
inline bool assertAux(bool _a, char const* _aStr, unsigned _line, char const* _file, char const* _func);
template<class A, class B>
#if defined(__GNUC__)

Loading…
Cancel
Save