Instancing and construction fixups for clang

This commit is contained in:
Danny Robson 2012-05-26 18:01:04 +10:00
parent 71c4df0cac
commit ea71f958f4
3 changed files with 16 additions and 10 deletions

View File

@ -79,7 +79,9 @@ namespace util {
{ return; } { return; }
} }
template struct extent<unsigned int>;
template struct extent<unsigned long>;
template struct extent<double>;
namespace util {
template struct extent<unsigned int>;
template struct extent<unsigned long>;
template struct extent<double>;
}

View File

@ -40,9 +40,13 @@ ipv4::ip::ip (uint32_t _integer):
{ ; } { ; }
ipv4::ip::ip (uint8_t a, uint8_t b, uint8_t c, uint8_t d): ipv4::ip::ip (uint8_t a, uint8_t b, uint8_t c, uint8_t d)
m_octets ({ a, b, c, d }) {
{ ; } m_octets[0] = a;
m_octets[1] = b;
m_octets[2] = c;
m_octets[3] = d;
}
ipv4::ip& ipv4::ip&

View File

@ -31,7 +31,7 @@ namespace util {
template <typename Ret, typename ...Args> template <typename Ret, typename ...Args>
class signal { class signal {
public: public:
typedef Ret (*callback_function)(Args...); //typedef Ret (*callback_function)(Args...);
typedef std::function<Ret(Args...)> callback_object; typedef std::function<Ret(Args...)> callback_object;
protected: protected:
@ -81,9 +81,9 @@ namespace util {
/// Add a callback to the list. /// Add a callback to the list.
const cookie //const cookie
connect (const callback_function &_cb) //connect (const callback_function &_cb)
{ return m_children.insert (m_children.end (), _cb); } // { return m_children.insert (m_children.end (), _cb); }
void disconnect (const cookie _cb) void disconnect (const cookie _cb)