Skip to content

Commit

Permalink
Fix Mac build. Refs #6096
Browse files Browse the repository at this point in the history
  • Loading branch information
martyngigg committed Dec 3, 2012
1 parent 5ff980b commit a613b21
Showing 1 changed file with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ Mantid::Kernel::DateAndTime timeFromPacket( const ADARA::PacketHeader &pkt)
struct timespec timestamp = pkt.timestamp();
timestamp.tv_sec -= ADARA::EPICS_EPOCH_OFFSET; // Convert back to Jan 1, 1990 epoch

return Mantid::Kernel::DateAndTime( timestamp.tv_sec, timestamp.tv_nsec);
// Make sure we pick the correct constructor (the Mac gets an ambiguous error)
return DateAndTime( static_cast<int64_t>(timestamp.tv_sec),
static_cast<int64_t>(timestamp.tv_nsec));
}


Expand Down

0 comments on commit a613b21

Please sign in to comment.