ext/em.cpp in libc-eventmachine-0.12.5.42 vs ext/em.cpp in libc-eventmachine-0.12.7.42
- old
+ new
@@ -84,10 +84,11 @@
NextHeartbeatTime (0),
LoopBreakerReader (-1),
LoopBreakerWriter (-1),
bEpoll (false),
bKqueue (false),
+ kqfd (-1),
epfd (-1)
{
// Default time-slice is just smaller than one hundred mills.
Quantum.tv_sec = 0;
Quantum.tv_usec = 90000;
@@ -930,11 +931,14 @@
Int64 fire_at = ((Int64)gTickCountTickover << 32) + (Int64)tick;
fire_at += (Int64)milliseconds;
#endif
Timer_t t;
- multimap<Int64,Timer_t>::iterator i =
- Timers.insert (make_pair (fire_at, t));
+ #ifdef OS_SOLARIS8
+ multimap<Int64,Timer_t>::iterator i = Timers.insert (multimap<Int64,Timer_t>::value_type (fire_at, t));
+ #else
+ multimap<Int64,Timer_t>::iterator i = Timers.insert (make_pair (fire_at, t));
+ #endif
return i->second.GetBindingChars();
}
/*******************************