Overview
Comment: | bridge: Add bridging for {OF,NS}Enumerator |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
7080ad2ebf33e16a63ca487ff0f7c2fb |
User & Date: | js on 2019-06-18 01:54:23 |
Other Links: | manifest | tags |
Context
2019-06-18
| ||
02:05 | OFDictionary: Add default -[objectEnumerator] check-in: e2d0c876b4 user: js tags: trunk | |
01:54 | bridge: Add bridging for {OF,NS}Enumerator check-in: 7080ad2ebf user: js tags: trunk | |
01:42 | bridge: Fix missing deallocs check-in: d2886a005f user: js tags: trunk | |
Changes
Modified src/bridge/Makefile from [f31f6bb273] to [e674b06e1c].
︙ | |||
19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | + + | INCLUDES := ${SRCS:.m=.h} \ NSBridging.h \ OFBridging.h \ ObjFWBridge.h SRCS += NSOFArray.m \ NSOFDictionary.m \ NSOFEnumerator.m \ OFNSArray.m \ OFNSDictionary.m \ OFNSEnumerator.m includesubdir = ObjFWBridge include ../../buildsys.mk CPPFLAGS += -I. -I.. -I../.. -I../exceptions -DOF_BRIDGE_LOCAL_INCLUDES LD = ${OBJC} FRAMEWORK_LIBS := -framework Foundation -F.. -framework ObjFW ${LIBS} LIBS := -framework Foundation -L.. -lobjfw ${LIBS} |
Modified src/bridge/NSOFDictionary.m from [08a371f09a] to [6b0e3be066].
︙ | |||
12 13 14 15 16 17 18 19 20 21 22 23 24 25 | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | + | * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "NSOFDictionary.h" #import "NSOFEnumerator.h" #import "OFDictionary.h" #import "NSBridging.h" #import "OFBridging.h" #import "OFOutOfRangeException.h" |
︙ | |||
59 60 61 62 63 64 65 66 | 60 61 62 63 64 65 66 67 68 69 70 71 72 73 | + + + + + + | size_t count = _dictionary.count; if (count > NSUIntegerMax) @throw [OFOutOfRangeException exception]; return (NSUInteger)count; } - (NSEnumerator *)keyEnumerator { return [[[NSOFEnumerator alloc] initWithOFEnumerator: [_dictionary keyEnumerator]] autorelease]; } @end |
Added src/bridge/NSOFEnumerator.h version [ceab83fad6].
|
Added src/bridge/NSOFEnumerator.m version [1bfad925c7].
|
Modified src/bridge/OFNSArray.m from [265432c593] to [1c099082bd].
︙ | |||
16 17 18 19 20 21 22 | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | - + - + - | */ #import <Foundation/NSArray.h> #import "OFNSArray.h" #import "NSBridging.h" |
︙ |
Modified src/bridge/OFNSDictionary.m from [3e5d86d339] to [d1ad9f6edf].
︙ | |||
14 15 16 17 18 19 20 21 22 23 24 | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | + - + - + - | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import <Foundation/NSDictionary.h> #import "OFNSDictionary.h" #import "OFNSEnumerator.h" #import "NSBridging.h" #import "OFBridging.h" |
︙ | |||
65 66 67 68 69 70 71 72 | 65 66 67 68 69 70 71 72 73 74 75 76 77 78 | + + + + + + | return object; } - (size_t)count { return _dictionary.count; } - (OFEnumerator *)keyEnumerator { return [[[OFNSEnumerator alloc] initWithNSEnumerator: [_dictionary keyEnumerator]] autorelease]; } @end |
Added src/bridge/OFNSEnumerator.h version [eef282bd93].
|
Added src/bridge/OFNSEnumerator.m version [f46fa6b701].
|