From 999c469a3e11ee78c40f10ddb4deefca1a73efa9 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 30 Dec 2010 14:50:48 +0000 Subject: [PATCH] Monotone-Parent: e356443889853160f98a31849aede88bc4bac6bd Monotone-Revision: cdceff0f0c850bdd8d0af588d8e4b75eb75634a5 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-12-30T14:50:48 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ OpenChange/NSValue+MAPIStore.h | 2 +- OpenChange/NSValue+MAPIStore.m | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f30f2de30..14b36de71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2010-12-30 Wolfgang Sourdeau + * OpenChange/NSValue+MAPIStore.m (-asDoubleInMemCtx): really + returns a double rather than an uint64_t. + * OpenChange/MAPIStoreTypes.m (MAPIDoubleValue): new wrapper methods for generating data of "double" type. (NSObjectFromMAPISPropValue, NSObjectFromSPropValue): now handle diff --git a/OpenChange/NSValue+MAPIStore.h b/OpenChange/NSValue+MAPIStore.h index 9cde6029e..1e2261557 100644 --- a/OpenChange/NSValue+MAPIStore.h +++ b/OpenChange/NSValue+MAPIStore.h @@ -30,7 +30,7 @@ - (uint8_t *) asBooleanInMemCtx: (void *) memCtx; - (uint16_t *) asShortInMemCtx: (void *) memCtx; - (uint32_t *) asLongInMemCtx: (void *) memCtx; -- (uint64_t *) asDoubleInMemCtx: (void *) memCtx; +- (double *) asDoubleInMemCtx: (void *) memCtx; @end diff --git a/OpenChange/NSValue+MAPIStore.m b/OpenChange/NSValue+MAPIStore.m index 262e41afc..4800f7e91 100644 --- a/OpenChange/NSValue+MAPIStore.m +++ b/OpenChange/NSValue+MAPIStore.m @@ -56,11 +56,11 @@ return value; } -- (uint64_t *) asDoubleInMemCtx: (void *) memCtx +- (double *) asDoubleInMemCtx: (void *) memCtx { - uint64_t *value; + double *value; - value = talloc (memCtx, uint64_t); + value = talloc (memCtx, double); *value = [self doubleValue]; return value;