diff include/urweb/urweb_cpp.h @ 2280:985c8016b592

Merge.
author Ziv Scully <ziv@mit.edu>
date Thu, 12 Nov 2015 08:46:51 -0500
parents 32a407902d3b 14c45a0b6362
children 75cb60a7f6f1
line wrap: on
line diff
--- a/include/urweb/urweb_cpp.h	Wed Nov 11 20:01:48 2015 -0500
+++ b/include/urweb/urweb_cpp.h	Thu Nov 12 08:46:51 2015 -0500
@@ -277,6 +277,7 @@
 uw_Basis_int uw_Basis_toSeconds(struct uw_context *, uw_Basis_time);
 uw_Basis_int uw_Basis_diffInMilliseconds(struct uw_context *, uw_Basis_time, uw_Basis_time);
 uw_Basis_int uw_Basis_toMilliseconds(struct uw_context *, uw_Basis_time);
+uw_Basis_time uw_Basis_fromMilliseconds(struct uw_context *, uw_Basis_int);
 uw_Basis_time uw_Basis_fromDatetime(struct uw_context *, uw_Basis_int, uw_Basis_int, uw_Basis_int, uw_Basis_int, uw_Basis_int, uw_Basis_int);
 uw_Basis_int uw_Basis_datetimeYear(struct uw_context *, uw_Basis_time);
 uw_Basis_int uw_Basis_datetimeMonth(struct uw_context *, uw_Basis_time);