mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-23 00:41:02 +00:00
Fix logic error in last mod.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@15494 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
12f583c06a
commit
737d9b20cd
1 changed files with 43 additions and 35 deletions
|
@ -214,14 +214,14 @@
|
|||
|
||||
(*(info->getValue))(other, @selector(getValue:), (void*)&oData);
|
||||
#undef PT
|
||||
#if (TYPE_ORDER & 1) == 1 && TYPE_ORDER < 11
|
||||
#if GS_SIZEOF_CHAR < GS_SIZEOF_SHORT
|
||||
#if (TYPE_ORDER & 1) == 1
|
||||
#if GS_SIZEOF_CHAR < GS_SIZEOF_SHORT && TYPE_ORDER < 3
|
||||
#define PT (short)
|
||||
#elif GS_SIZEOF_CHAR < GS_SIZEOF_INT
|
||||
#elif GS_SIZEOF_CHAR < GS_SIZEOF_INT && TYPE_ORDER < 5
|
||||
#define PT (int)
|
||||
#elif GS_SIZEOF_CHAR < GS_SIZEOF_LONG
|
||||
#elif GS_SIZEOF_CHAR < GS_SIZEOF_LONG && TYPE_ORDER < 7
|
||||
#define PT (long)
|
||||
#elif GS_SIZEOF_CHAR < GS_SIZEOF_LONG_LONG
|
||||
#elif GS_SIZEOF_CHAR < GS_SIZEOF_LONG_LONG && TYPE_ORDER < 9
|
||||
#define PT (long long)
|
||||
#else
|
||||
#define PT (double)
|
||||
|
@ -242,14 +242,14 @@
|
|||
|
||||
(*(info->getValue))(other, @selector(getValue:), (void*)&oData);
|
||||
#undef PT
|
||||
#if (TYPE_ORDER & 1) == 0 && TYPE_ORDER < 11
|
||||
#if GS_SIZEOF_CHAR < GS_SIZEOF_SHORT
|
||||
#if (TYPE_ORDER & 1) == 0
|
||||
#if GS_SIZEOF_CHAR < GS_SIZEOF_SHORT && TYPE_ORDER < 3
|
||||
#define PT (short)
|
||||
#elif GS_SIZEOF_CHAR < GS_SIZEOF_INT
|
||||
#elif GS_SIZEOF_CHAR < GS_SIZEOF_INT && TYPE_ORDER < 5
|
||||
#define PT (int)
|
||||
#elif GS_SIZEOF_CHAR < GS_SIZEOF_LONG
|
||||
#elif GS_SIZEOF_CHAR < GS_SIZEOF_LONG && TYPE_ORDER < 7
|
||||
#define PT (long)
|
||||
#elif GS_SIZEOF_CHAR < GS_SIZEOF_LONG_LONG
|
||||
#elif GS_SIZEOF_CHAR < GS_SIZEOF_LONG_LONG && TYPE_ORDER < 9
|
||||
#define PT (long long)
|
||||
#else
|
||||
#define PT (double)
|
||||
|
@ -270,14 +270,14 @@
|
|||
|
||||
(*(info->getValue))(other, @selector(getValue:), (void*)&oData);
|
||||
#undef PT
|
||||
#if (TYPE_ORDER & 1) == 1 && TYPE_ORDER < 11
|
||||
#if GS_SIZEOF_CHAR < GS_SIZEOF_SHORT
|
||||
#if (TYPE_ORDER & 1) == 1
|
||||
#if GS_SIZEOF_CHAR < GS_SIZEOF_SHORT && TYPE_ORDER < 3
|
||||
#define PT (short)
|
||||
#elif GS_SIZEOF_CHAR < GS_SIZEOF_INT
|
||||
#elif GS_SIZEOF_CHAR < GS_SIZEOF_INT && TYPE_ORDER < 5
|
||||
#define PT (int)
|
||||
#elif GS_SIZEOF_CHAR < GS_SIZEOF_LONG
|
||||
#elif GS_SIZEOF_CHAR < GS_SIZEOF_LONG && TYPE_ORDER < 7
|
||||
#define PT (long)
|
||||
#elif GS_SIZEOF_CHAR < GS_SIZEOF_LONG_LONG
|
||||
#elif GS_SIZEOF_CHAR < GS_SIZEOF_LONG_LONG && TYPE_ORDER < 9
|
||||
#define PT (long long)
|
||||
#else
|
||||
#define PT (double)
|
||||
|
@ -298,12 +298,12 @@
|
|||
|
||||
(*(info->getValue))(other, @selector(getValue:), (void*)&oData);
|
||||
#undef PT
|
||||
#if (TYPE_ORDER & 1) == 0 && TYPE_ORDER < 11
|
||||
#if GS_SIZEOF_SHORT < GS_SIZEOF_INT
|
||||
#if (TYPE_ORDER & 1) == 0
|
||||
#if GS_SIZEOF_SHORT < GS_SIZEOF_INT && TYPE_ORDER < 5
|
||||
#define PT (int)
|
||||
#elif GS_SIZEOF_SHORT < GS_SIZEOF_LONG
|
||||
#elif GS_SIZEOF_SHORT < GS_SIZEOF_LONG && TYPE_ORDER < 7
|
||||
#define PT (long)
|
||||
#elif GS_SIZEOF_SHORT < GS_SIZEOF_LONG_LONG
|
||||
#elif GS_SIZEOF_SHORT < GS_SIZEOF_LONG_LONG && TYPE_ORDER < 9
|
||||
#define PT (long long)
|
||||
#else
|
||||
#define PT (double)
|
||||
|
@ -324,12 +324,12 @@
|
|||
|
||||
(*(info->getValue))(other, @selector(getValue:), (void*)&oData);
|
||||
#undef PT
|
||||
#if (TYPE_ORDER & 1) == 1 && TYPE_ORDER < 11
|
||||
#if GS_SIZEOF_SHORT < GS_SIZEOF_INT
|
||||
#if (TYPE_ORDER & 1) == 1
|
||||
#if GS_SIZEOF_SHORT < GS_SIZEOF_INT && TYPE_ORDER < 5
|
||||
#define PT (int)
|
||||
#elif GS_SIZEOF_SHORT < GS_SIZEOF_LONG
|
||||
#elif GS_SIZEOF_SHORT < GS_SIZEOF_LONG && TYPE_ORDER < 7
|
||||
#define PT (long)
|
||||
#elif GS_SIZEOF_SHORT < GS_SIZEOF_LONG_LONG
|
||||
#elif GS_SIZEOF_SHORT < GS_SIZEOF_LONG_LONG && TYPE_ORDER < 9
|
||||
#define PT (long long)
|
||||
#else
|
||||
#define PT (double)
|
||||
|
@ -350,10 +350,10 @@
|
|||
|
||||
(*(info->getValue))(other, @selector(getValue:), (void*)&oData);
|
||||
#undef PT
|
||||
#if (TYPE_ORDER & 1) == 0 && TYPE_ORDER < 11
|
||||
#if GS_SIZEOF_INT < GS_SIZEOF_LONG
|
||||
#if (TYPE_ORDER & 1) == 0
|
||||
#if GS_SIZEOF_INT < GS_SIZEOF_LONG && TYPE_ORDER < 7
|
||||
#define PT (long)
|
||||
#elif GS_SIZEOF_INT < GS_SIZEOF_LONG_LONG
|
||||
#elif GS_SIZEOF_INT < GS_SIZEOF_LONG_LONG && TYPE_ORDER < 9
|
||||
#define PT (long long)
|
||||
#else
|
||||
#define PT (double)
|
||||
|
@ -374,10 +374,10 @@
|
|||
|
||||
(*(info->getValue))(other, @selector(getValue:), (void*)&oData);
|
||||
#undef PT
|
||||
#if (TYPE_ORDER & 1) == 1 && TYPE_ORDER < 11
|
||||
#if GS_SIZEOF_INT < GS_SIZEOF_LONG
|
||||
#if (TYPE_ORDER & 1) == 1
|
||||
#if GS_SIZEOF_INT < GS_SIZEOF_LONG && TYPE_ORDER < 7
|
||||
#define PT (long)
|
||||
#elif GS_SIZEOF_INT < GS_SIZEOF_LONG_LONG
|
||||
#elif GS_SIZEOF_INT < GS_SIZEOF_LONG_LONG && TYPE_ORDER < 9
|
||||
#define PT (long long)
|
||||
#else
|
||||
#define PT (double)
|
||||
|
@ -398,8 +398,8 @@
|
|||
|
||||
(*(info->getValue))(other, @selector(getValue:), (void*)&oData);
|
||||
#undef PT
|
||||
#if (TYPE_ORDER & 1) == 0 && TYPE_ORDER < 11
|
||||
#if GS_SIZEOF_LONG < GS_SIZEOF_LONG_LONG
|
||||
#if (TYPE_ORDER & 1) == 0
|
||||
#if GS_SIZEOF_LONG < GS_SIZEOF_LONG_LONG && TYPE_ORDER < 9
|
||||
#define PT (long long)
|
||||
#else
|
||||
#define PT (double)
|
||||
|
@ -420,8 +420,8 @@
|
|||
|
||||
(*(info->getValue))(other, @selector(getValue:), (void*)&oData);
|
||||
#undef PT
|
||||
#if (TYPE_ORDER & 1) == 1 && TYPE_ORDER < 11
|
||||
#if GS_SIZEOF_LONG < GS_SIZEOF_LONG_LONG
|
||||
#if (TYPE_ORDER & 1) == 1
|
||||
#if GS_SIZEOF_LONG < GS_SIZEOF_LONG_LONG && TYPE_ORDER < 9
|
||||
#define PT (long long)
|
||||
#else
|
||||
#define PT (double)
|
||||
|
@ -442,7 +442,7 @@
|
|||
|
||||
(*(info->getValue))(other, @selector(getValue:), (void*)&oData);
|
||||
#undef PT
|
||||
#if (TYPE_ORDER & 1) == 0 && TYPE_ORDER < 11
|
||||
#if (TYPE_ORDER & 1) == 0
|
||||
#define PT (double)
|
||||
#else
|
||||
#define PT
|
||||
|
@ -460,7 +460,7 @@
|
|||
|
||||
(*(info->getValue))(other, @selector(getValue:), (void*)&oData);
|
||||
#undef PT
|
||||
#if (TYPE_ORDER & 1) == 1 && TYPE_ORDER < 11
|
||||
#if (TYPE_ORDER & 1) == 1
|
||||
#define PT (double)
|
||||
#else
|
||||
#define PT
|
||||
|
@ -477,6 +477,12 @@
|
|||
float oData;
|
||||
|
||||
(*(info->getValue))(other, @selector(getValue:), (void*)&oData);
|
||||
#undef PT
|
||||
#if TYPE_ORDER != 11
|
||||
#define PT (double)
|
||||
#else
|
||||
#define PT
|
||||
#endif
|
||||
if (PT data == PT oData)
|
||||
return NSOrderedSame;
|
||||
else if (PT data < PT oData)
|
||||
|
@ -489,6 +495,8 @@
|
|||
double oData;
|
||||
|
||||
(*(info->getValue))(other, @selector(getValue:), (void*)&oData);
|
||||
#undef PT
|
||||
#define PT (double)
|
||||
if (PT data == PT oData)
|
||||
return NSOrderedSame;
|
||||
else if (PT data < PT oData)
|
||||
|
|
Loading…
Reference in a new issue