hrev48860 adds 1 changeset to branch 'master' old head: b726ad92036d62909d1365f5116a4eb83d586270 new head: 83d5a5313dfd29818c00cf9d28414a82ccf6935f overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=83d5a5313dfd+%5Eb726ad92036d ---------------------------------------------------------------------------- 83d5a5313dfd: MessageFormat: Use int64 instead of off_t They are effectively the same thing, but int64 is more generic. I used an off_t because that is what Tracker passed in, yet, this could be used in other places where an off_t doesn't make as much sense. [ John Scipione <jscipione@xxxxxxxxx> ] ---------------------------------------------------------------------------- Revision: hrev48860 Commit: 83d5a5313dfd29818c00cf9d28414a82ccf6935f URL: http://cgit.haiku-os.org/haiku/commit/?id=83d5a5313dfd Author: John Scipione <jscipione@xxxxxxxxx> Date: Wed Mar 4 20:40:55 2015 UTC ---------------------------------------------------------------------------- 2 files changed, 3 insertions(+), 3 deletions(-) headers/os/locale/MessageFormat.h | 2 +- src/kits/locale/MessageFormat.cpp | 4 ++-- ---------------------------------------------------------------------------- diff --git a/headers/os/locale/MessageFormat.h b/headers/os/locale/MessageFormat.h index 9d75c1a..eeaf978 100644 --- a/headers/os/locale/MessageFormat.h +++ b/headers/os/locale/MessageFormat.h @@ -28,7 +28,7 @@ public: status_t InitCheck(); - status_t Format(BString& buffer, const off_t arg) const; + status_t Format(BString& buffer, const int64 arg) const; private: status_t _Initialize(const icu::UnicodeString&); diff --git a/src/kits/locale/MessageFormat.cpp b/src/kits/locale/MessageFormat.cpp index b4dc58c..4c66e5a 100644 --- a/src/kits/locale/MessageFormat.cpp +++ b/src/kits/locale/MessageFormat.cpp @@ -45,7 +45,7 @@ BMessageFormat::InitCheck() status_t -BMessageFormat::Format(BString& output, const off_t arg) const +BMessageFormat::Format(BString& output, const int64 arg) const { if (fInitStatus != B_OK) return fInitStatus; @@ -54,7 +54,7 @@ BMessageFormat::Format(BString& output, const off_t arg) const UErrorCode error = U_ZERO_ERROR; Formattable arguments[] = { - (off_t)arg + (int64)arg }; FieldPosition pos;