explicitly specify types in union

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@28762 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2009-10-02 15:14:42 +00:00
parent 7b1dbbff0b
commit fcc33c1b71
9 changed files with 29 additions and 4 deletions

View file

@ -1,3 +1,15 @@
2009-10-01 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSPortCoder.m:
* Source/NSKeyedArchiver.m:
* Source/NSConcreteMapTable.m:
* Source/NSConnection.m:
* Source/NSSerializer.m:
* Source/NSArchiver.m:
* Source/NSConcreteHashTable.m:
* Headers/Additions/GNUstepBase/GSIMap.h:
Explicitly specify types present in GSIUnion
2009-09-30 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSLock.m: Fix BOOL methods to return YES or NO.

View file

@ -127,10 +127,10 @@ extern "C" {
/*
* If there is no bitmask defined to supply the types that
* may be used as keys in the map, default to permitting all types.
* may be used as keys in the map, default to none.
*/
#ifndef GSI_MAP_KTYPES
#define GSI_MAP_KTYPES GSUNION_ALL
#define GSI_MAP_KTYPES 0
#endif
/*
@ -172,10 +172,10 @@ extern "C" {
/*
* If there is no bitmask defined to supply the types that
* may be used as values in the map, default to permitting all types.
* may be used as values in the map, default to none.
*/
#ifndef GSI_MAP_VTYPES
#define GSI_MAP_VTYPES GSUNION_ALL
#define GSI_MAP_VTYPES 0
#endif
/*

View file

@ -29,6 +29,8 @@
/*
* Setup for inline operation of pointer map tables.
*/
#define GSI_MAP_KTYPES GSUNION_INT | GSUNION_PTR | GSUNION_OBJ | GSUNION_CLS
#define GSI_MAP_VTYPES GSUNION_INT | GSUNION_PTR | GSUNION_OBJ
#define GSI_MAP_RETAIN_KEY(M, X)
#define GSI_MAP_RELEASE_KEY(M, X)
#define GSI_MAP_RETAIN_VAL(M, X)

View file

@ -73,6 +73,7 @@ typedef GSIMapNode_t *GSIMapNode;
@end
#define GSI_MAP_HAS_VALUE 0
#define GSI_MAP_KTYPES GSUNION_PTR | GSUNION_OBJ
#define GSI_MAP_TABLE_T NSConcreteHashTable
#define GSI_MAP_HASH(M, X)\

View file

@ -79,6 +79,8 @@ typedef GSIMapNode_t *GSIMapNode;
#define GSI_MAP_TABLE_T NSConcreteMapTable
#define GSI_MAP_KTYPES GSUNION_PTR | GSUNION_OBJ
#define GSI_MAP_VTYPES GSUNION_PTR | GSUNION_OBJ
#define GSI_MAP_HASH(M, X)\
(M->legacy ? M->cb.old.k.hash(M, X.ptr) \
: pointerFunctionsHash(&M->cb.pf.k, X.ptr))

View file

@ -42,6 +42,8 @@
/*
* Setup for inline operation of pointer map tables.
*/
#define GSI_MAP_KTYPES GSUNION_PTR | GSUNION_OBJ | GSUNION_INT
#define GSI_MAP_VTYPES GSUNION_PTR | GSUNION_OBJ
#define GSI_MAP_RETAIN_KEY(M, X)
#define GSI_MAP_RELEASE_KEY(M, X)
#define GSI_MAP_RETAIN_VAL(M, X)

View file

@ -37,6 +37,8 @@
/*
* Setup for inline operation of pointer map tables.
*/
#define GSI_MAP_KTYPES GSUNION_PTR | GSUNION_OBJ | GSUNION_CLS | GSUNION_INT
#define GSI_MAP_VTYPES GSUNION_PTR | GSUNION_OBJ | GSUNION_INT
#define GSI_MAP_RETAIN_VAL(M, X)
#define GSI_MAP_RELEASE_VAL(M, X)
#define GSI_MAP_HASH(M, X) ((X).uint)

View file

@ -53,6 +53,8 @@
/*
* Setup for inline operation of pointer map tables.
*/
#define GSI_MAP_KTYPES GSUNION_PTR | GSUNION_OBJ | GSUNION_CLS | GSUNION_INT
#define GSI_MAP_VTYPES GSUNION_PTR | GSUNION_OBJ | GSUNION_CLS | GSUNION_INT
#define GSI_MAP_RETAIN_KEY(M, X)
#define GSI_MAP_RELEASE_KEY(M, X)
#define GSI_MAP_RETAIN_VAL(M, X)

View file

@ -55,6 +55,8 @@
/*
* Setup for inline operation of string map tables.
*/
#define GSI_MAP_KTYPES GSUNION_OBJ
#define GSI_MAP_VTYPES GSUNION_INT
#define GSI_MAP_RETAIN_KEY(M, X)
#define GSI_MAP_RELEASE_KEY(M, X)
#define GSI_MAP_RETAIN_VAL(M, X)