Skip to content
This repository

Fix clang warning in NSManagedObjectContext category #108

Merged
merged 1 commit into from over 2 years ago

2 participants

Tony Arnold Magical Panda Software
Tony Arnold
Owner

Clang seems to need the diagnostic pragma to cover the
THREAD_ISOLATION_ENABLED() macro as well as the performSelector:
method to suppress this warning.

Tony Arnold tonyarnold Fix clang warning
Clang seems to need the diagnostic pragma to cover the
`THREAD_ISOLATION_ENABLED()` macro as well as the `performSelector:`
method to suppress this warning.
260d86c
Deleted user

It seems same issue in MagicalDataImport category.

Tony Arnold
Owner

@ploddi which category? Of the three places where the clang suppression is used, this was the only one that was showing an issue under Xcode 4.2/Clang 3.0 for me.

Deleted user

Ah its NSMangedObject+MagicalDataImport category not NSManagedObjectContext. My bad.

4 warnings for me. Same toolchain like yours.

Magical Panda Software

Sweet, thanks for the code

Magical Panda Software magicalpanda merged commit 667738a into from
Alexsander Akers a2 referenced this pull request from a commit in zwaldowski/AZCoreRecord
Alexsander Akers a2 Squashed commit of the following:
commit 6dc2986
Merge: 9ea27ef 667738a
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 19:03:55 2011 -0500

    Merge commit '667738a6c1bdedefd57da2d93298e498d5b716a4' into dizzy

commit 9ea27ef
Merge: e820494 260d86c
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 19:03:46 2011 -0500

    Merge commit '260d86c5e17a6f008230f52b569494875bd064c6' into dizzy

    Conflicts:
    	Source/Categories/NSManagedObjectContext+MagicalRecord.m

commit e820494
Merge: 9523f35 7567e75
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 19:03:21 2011 -0500

    Merge commit '7567e75e17bed50a25b1e415d2e74e35ef039e81' into dizzy

    Conflicts:
    	Source/Categories/NSManagedObjectContext+MagicalRecord.m

commit 9523f35
Merge: 231b01e bc4ae81
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 19:01:04 2011 -0500

    Merge commit 'bc4ae8102365862f67f85a40394a5f5f7d19668d' into dizzy

    Conflicts:
    	Magical Record.xcodeproj/project.pbxproj
    	Source/Categories/NSManagedObjectContext+MagicalRecord.m
    	Unit Tests/Fixtures/iOS/TestEntities/_AbstractRelatedEntity.h
    	Unit Tests/Fixtures/iOS/TestEntities/_ConcreteRelatedEntity.h
    	Unit Tests/Fixtures/iOS/TestEntities/_MappedEntity.h
    	Unit Tests/Fixtures/iOS/TestEntities/_SingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKey.h
    	Unit Tests/Fixtures/iOS/TestEntities/_SingleEntityRelatedToMappedEntityUsingDefaults.h
    	Unit Tests/Fixtures/iOS/TestEntities/_SingleEntityRelatedToMappedEntityUsingMappedPrimaryKey.h
    	Unit Tests/Fixtures/iOS/TestEntities/_SingleEntityRelatedToMappedEntityWithNestedMappedAttributes.h
    	Unit Tests/Fixtures/iOS/TestEntities/_SingleEntityRelatedToMappedEntityWithSecondaryMappings.h
    	Unit Tests/Fixtures/iOS/TestEntities/_SingleEntityWithNoRelationships.h
    	Unit Tests/Fixtures/iOS/TestEntities/_SingleRelatedEntity.h

commit 231b01e456ed871b2b53c4acad751fcb54e42964
Merge: ac2c99a b446251
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:59:14 2011 -0500

    Merge commit 'b446251c21c0614a5e5d696652208fee91bb4eb2' into dizzy

    Conflicts:
    	Source/Categories/NSPersistentStore+MagicalRecord.m
    	Source/Categories/NSPersistentStoreCoordinator+MagicalRecord.m
    	Source/CoreData+MagicalRecord.h

commit ac2c99a2c76266a651b6e73165b90c877d99ca9a
Merge: 90e2504 9a3c389
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:58:55 2011 -0500

    Merge commit '9a3c38903eb704cda941a11f32168fcb4560c6a2' into dizzy

commit 90e25046554beb817e98b6f2a523537c6c4ee6f8
Merge: 544c317 8c75ec6
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:58:49 2011 -0500

    Merge commit '8c75ec620d3280b5357813b5e1284e3268191e6f' into dizzy

    Conflicts:
    	Source/Categories/NSPersistentStoreCoordinator+MagicalRecord.m

commit 544c317ded5f200a84b82804e7baf5e0625fe913
Merge: 2aa64fa ae36a95
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:58:25 2011 -0500

    Merge commit 'ae36a95850f1eb5d4f3287e8e0a05b4733c21745' into dizzy

    Conflicts:
    	Source/CoreData+MagicalRecord.h

commit 2aa64fa33d07dcaa8496ea6b6491ad0bdee20c09
Merge: a022d7d da50cdc
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:57:59 2011 -0500

    Merge commit 'da50cdc9454c3669e265e1c5e1060175e7bc9366' into dizzy

    Conflicts:
    	Source/CoreData+MagicalRecord.h

commit a022d7deadc7dcb6ee4eec9848eb4c161b77f3c1
Merge: ca04079 480c475
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:57:45 2011 -0500

    Merge commit '480c475ae9bbd1d5c264a209d10f390d5ebb36d5' into dizzy

    Conflicts:
    	Source/CoreData+MagicalRecord.h

commit ca040792713919d6b498ee854b5928c46e494082
Merge: 1effe48 1d63691
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:57:29 2011 -0500

    Merge commit '1d636910118f5b9843fcb4c12d813f219ffb7a2c' into dizzy

    Conflicts:
    	Source/CoreData+MagicalRecord.h

commit 1effe4862fa893c95b52c1c58d00f60879ed1a45
Merge: f38894c b04a088
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:57:15 2011 -0500

    Merge commit 'b04a088edaf891b4975221dddd8ab56c02d31268' into dizzy

commit f38894c79772f7586b8abc7c9e9216fcd1dc9c27
Merge: b9a825e 93c9cce
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:57:06 2011 -0500

    Merge commit '93c9ccec53843f6a78961c27fa4cf8b3f82dc70b' into dizzy

    Conflicts:
    	Source/CoreData+MagicalRecord.h

commit b9a825ecc87226a0f164ecc96c8eb6d5679758f5
Merge: a5ca895 df9e704
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:56:48 2011 -0500

    Merge commit 'df9e70484c3393240188e60ddae751ee53459226' into dizzy

commit a5ca895fc3e5635224241496e336ba203888a397
Merge: 0f5eac8 911fd89
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:56:38 2011 -0500

    Merge commit '911fd89eae983f0acacc4a1b8d1f5e4ce1eea452' into dizzy

    Conflicts:
    	Source/CoreData+MagicalRecord.h

commit 0f5eac8f387088697fbf1cfe228346c6528a9d7d
Merge: b05cc17 681b428
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:56:17 2011 -0500

    Merge commit '681b428a5589edfac73cc19e522a7e504c61875e' into dizzy

commit b05cc1725bb5a213a184243d1ac8e2bcd5c81b27
Merge: 337f463 17e215e
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:56:08 2011 -0500

    Merge commit '17e215e7909eda78c14bd909709d05a17dc43de4' into dizzy

    Conflicts:
    	Source/CoreData+MagicalRecord.h

commit 337f463364bef131fb08f908789ea1f60b4bd4f7
Merge: db6706c 04d6861
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:55:50 2011 -0500

    Merge commit '04d686105684447d0f2f3434ef5d09063d393886' into dizzy

    Conflicts:
    	Source/Categories/NSManagedObjectModel+MagicalRecord.m
    	Source/Categories/NSPersistentStore+MagicalRecord.m
    	Source/Categories/NSPersistentStoreCoordinator+MagicalRecord.m

commit db6706c940c2965c097fe6f14e1d70b227612caf
Merge: 43432cf be9d5c4
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:55:28 2011 -0500

    Merge commit 'be9d5c44ee1086fc7eeb6e0af5b6043fd6124f1d' into dizzy

    Conflicts:
    	Source/Categories/NSManagedObject+MagicalRecord.m

commit 43432cfcecc91b45615e548d5990aa201d6800cd
Merge: 68a8e64 52aaff9
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:54:08 2011 -0500

    Merge commit '52aaff948727ac3785819266803ae3dbfbf2cee0' into dizzy

    Conflicts:
    	Source/Categories/NSManagedObjectContext+MagicalRecord.m
    	Unit Tests/NSManagedObjectContextHelperTests.m

commit 68a8e648c27dd4b62ce582edf901c324d66e32ca
Merge: 7e478ad 6e2cfd8
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:53:24 2011 -0500

    Merge commit '6e2cfd8151ef742a35297d17b5fbf2bc920ee1a9' into dizzy

commit 7e478ad0400ccd0fa9d4733b25808ac94a5c1354
Merge: a8c52dc abb22be
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:53:17 2011 -0500

    Merge commit 'abb22bebdc2a238331595b716043cbe8fc4c7405' into dizzy

commit a8c52dcc58442d99ee1d42e56741be66dbf73553
Merge: 601504b 6d94f4a
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:53:09 2011 -0500

    Merge commit '6d94f4ae1b2c460d06c2fa1793e655026e55986a' into dizzy

    Conflicts:
    	Source/MagicalRecordShorthand.h

commit 601504b59b63f925b40feb0f428413a90a1ef39f
Merge: e05b243 aba82b2
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:52:50 2011 -0500

    Merge commit 'aba82b26192b34074c099dc3d459966ded7cb784' into dizzy

    Conflicts:
    	Source/Categories/NSManagedObject+MagicalRecord.h
    	Source/Categories/NSManagedObject+MagicalRecord.m

commit e05b24380ef341d8dfd36b57908e772227055418
Merge: 443df8c a689dfe
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:51:26 2011 -0500

    Merge commit 'a689dfe612f61ae539f02600fc926c5d12b3b3f4' into dizzy

    Conflicts:
    	Magical Record.xcodeproj/project.pbxproj
    	Source/Categories/NSManagedObject+MagicalDataImport.m
    	Source/Categories/NSManagedObjectContext+MagicalRecord.m
    	Unit Tests/Fixtures/FixtureHelpers.m
    	Unit Tests/ImportSingleRelatedEntityTests.m
    	Unit Tests/MagicalDataImportTestCase.m
    	Unit Tests/NSManagedObjectContextHelperTests.m

commit 443df8c10a3225d8343cdfa0810f5737cfdbc62c
Merge: 7a26ebd 07538d5
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:47:04 2011 -0500

    Merge commit '07538d5a1a0d60aace0e55ee57e6b26fc85b6c2f' into dizzy

    Conflicts:
    	Source/Categories/NSPersistentStoreCoordinator+MagicalRecord.m
    	Unit Tests/MagicalRecordHelperTests.m

commit 7a26ebd18d62f0568561ce5b82db1056f795812a
Merge: 485d7ec 6de353f
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:42:19 2011 -0500

    Merge commit '6de353f3d1d0540dd1f34ca909a86a7550ab67f3' into dizzy

    Conflicts:
    	Unit Tests/ImportSingleRelatedEntityTests.m

commit 485d7eca6fa08366b9ffff6892103a0885f3dbd8
Merge: 03f8471 78262cb
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:39:58 2011 -0500

    Merge commit '78262cbad7c489dc0ed740a9b42f2c2693a963dc' into dizzy

    Conflicts:
    	Magical Record.xcodeproj/project.pbxproj
    	Source/Categories/NSManagedObject+MagicalDataImport.h
    	Source/Categories/NSManagedObject+MagicalDataImport.m
    	Source/CoreData+MagicalRecord.h
    	Source/MagicalRecordShorthand.h

commit 03f84711ea14c7ccde88e14e46f5f2799c72b656
Merge: 32fe19b 8938488
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:35:36 2011 -0500

    Merge commit '8938488d2e26c92474e501deb4e674ade2ec9e7e' into dizzy

    Conflicts:
    	Source/CoreData+MagicalRecord.h

commit 32fe19b868d933369a98ee2deb521096a0eed62b
Merge: efd9096 3cf33f4
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:35:08 2011 -0500

    Merge commit '3cf33f47ae6bc3158be2346fa0c22cd013749d60' into dizzy

    Conflicts:
    	Source/Categories/NSManagedObjectContext+MagicalRecord.m
    	Source/Categories/NSPersistentStore+MagicalRecord.m
    	Source/CoreData+MagicalRecord.h

commit efd909696cccf0b7f617354023e0093ce881228e
Merge: 3bb52d2 db98674
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:34:39 2011 -0500

    Merge commit 'db986748c4b35ebb4287f90731261f0d16016591' into dizzy

    Conflicts:
    	Source/Categories/NSManagedObjectContext+MagicalRecord.m
    	Source/CoreData+MagicalRecord.h

commit 3bb52d2884c3329d3d70b3d66e5c3610f73f3bd0
Merge: 68e90d7 ac1135c
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:30:06 2011 -0500

    Merge commit 'ac1135c23a4ab6c8244737baa056d7e1aeae86b0' into dizzy

    Conflicts:
    	Source/Categories/NSManagedObjectModel+MagicalRecord.m
    	Source/Categories/NSPersistentStoreCoordinator+MagicalRecord.m
    	Source/CoreData+MagicalRecord.h
    	Source/MagicalRecordHelpers.m

commit 68e90d7e43857ba60f92e36e4ed3730198108578
Merge: 6405e0e 0dc65ac
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:29:18 2011 -0500

    Merge commit '0dc65ac71493f4b0e004d53f61458a4c96e9ef1e' into dizzy

commit 6405e0ece2887f07afc80dad9049157019ad10de
Merge: 0213d9c bba28d6
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:29:09 2011 -0500

    Merge commit 'bba28d6c816ac5e855dd80984c678fbe2ec1895c' into dizzy

    Conflicts:
    	Source/CoreData+MagicalRecord.h

commit 0213d9c0c137f4385eae0e093a9e43e6b74e5534
Merge: 6c43020 cfb1942
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:28:42 2011 -0500

    Merge commit 'cfb19422bb2c75cb5019cedd8f0a6612a1f73b34' into dizzy

    Conflicts:
    	Source/Categories/NSManagedObjectModel+MagicalRecord.m
    	Source/Categories/NSPersistentStore+MagicalRecord.m
    	Source/Categories/NSPersistentStoreCoordinator+MagicalRecord.m
    	Source/CoreData+MagicalRecord.h
    	Source/MagicalRecordHelpers.m

commit 6c4302044a067770aecfc6141b674002d76f7f75
Merge: 6cc0122 38f12c5
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:28:08 2011 -0500

    Merge commit '38f12c500d983869d49225fdc071848a7aac237e' into dizzy

    Conflicts:
    	Source/Categories/NSManagedObjectContext+MagicalRecord.m
    	Source/Categories/NSPersistentStore+MagicalRecord.m
    	Source/CoreData+MagicalRecord.h
    	Source/MRCoreDataAction.m

commit 6cc012248f605a6e2f86323dae93b086f48c0178
Merge: 1557d6f 2d1c123
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:23:38 2011 -0500

    Merge commit '2d1c1231a104035fc94d094fc34f4bc700262790' into dizzy

commit 1557d6f1d31d0386cf04169537c82cf9fcd8718a
Merge: 645fced 25e5029
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:23:30 2011 -0500

    Merge commit '25e502916487293d1519fdd120802f541430b689' into dizzy

    Conflicts:
    	Source/Categories/NSManagedObjectContext+MagicalRecord.m
    	Source/CoreData+MagicalRecord.h
    	Source/MRCoreDataAction.m

commit 645fcedb4e3287ef667248b41631d57b62a9cdbd
Merge: 5861a55 5b1442e
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:20:03 2011 -0500

    Merge commit '5b1442ed1b81fcb9f204126997b3d224894bc2d2' into dizzy

commit 5861a5536a4b014e598126170a07f1211bc5dfec
Merge: fc066e8 81ba7e4
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:19:52 2011 -0500

    Merge commit '81ba7e4cc49424fbcf0b35f325d26870fb411aeb' into dizzy

commit fc066e88f5a325068cc2b0f28e94b5f18e1efef0
Merge: 534e2db d698e27
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:19:34 2011 -0500

    Merge commit 'd698e27c2570896b0f407b192b1ed153ec01b431' into dizzy

    Conflicts:
    	Source/Categories/NSPersistentStoreCoordinator+MagicalRecord.m

commit 534e2db4ed9fc9ff2699124906fbd29e946ffb30
Merge: f2f2cd6 5ed2c38
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:19:09 2011 -0500

    Merge commit '5ed2c380ebf9671885be184d5405f0c0643e3609' into dizzy

    Conflicts:
    	Source/Categories/NSPersistentStoreCoordinator+MagicalRecord.m

commit f2f2cd655e716c5b3f18d148ecb8b961a6ef7a61
Merge: 2243df1 0a76291
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:18:44 2011 -0500

    Merge commit '0a762917c3c3e8e827be950acec63452213660b9' into dizzy

commit 2243df1d27e425ae82d2d97fd9e9b1cff03c97a4
Merge: 9863f73 64f8b6d
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:18:24 2011 -0500

    Merge commit '64f8b6d59c245db02f8fd2eef494c2aa82a5bf1b' into dizzy

    Conflicts:
    	Magical Record.xcodeproj/project.pbxproj
    	Source/Categories/NSPersistentStoreCoordinator+MagicalRecord.h
    	Source/MagicalRecordShorthand.h

commit 9863f733b4092f83ac2f1fd0979e053674189053
Merge: 301416c c8ffde3
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:17:34 2011 -0500

    Merge commit 'c8ffde36b4a3948b0d66b16e8c2387d3a98e7123' into dizzy

    Conflicts:
    	Source/Categories/NSManagedObjectContext+MagicalRecord.m

commit 301416cad0527e2f9aaf511c80c61b5dc259dd47
Merge: 5015677 18d984e
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:17:16 2011 -0500

    Merge commit '18d984e363b8878d9d6d7a0e5df729e30d91250c' into dizzy

commit 5015677d312cf6b81a9a47ee9b0d9f148e3118d5
Merge: 0e9d0d5 3dd7591
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:17:03 2011 -0500

    Merge commit '3dd7591d189377af90914b65ca1cb0df7ec76279' into dizzy

    Conflicts:
    	Source/Categories/NSManagedObjectContext+MagicalRecord.m
    	Source/CoreData+MagicalRecord.h

commit 0e9d0d5aa927d4acf03a357dfcaff079ca802e09
Merge: e6d26d4 2bcd117
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:16:43 2011 -0500

    Merge commit '2bcd11706980ad461de427992dc2f9856f2fc823' into dizzy

    Conflicts:
    	Source/Categories/NSManagedObjectContext+MagicalRecord.m
    	Source/CoreData+MagicalRecord.h

commit e6d26d4dca304877a9e2fb62094b1586a1083f5c
Merge: c13208d d1af005
Author: zwaldowski@gmail.com <zwaldowski@gmail.com>
Date:   Tue Dec 13 18:16:05 2011 -0500

    Merge commit 'd1af0058f7787011eeee867d9ae4ddbd3dda6359' into dizzy

    Conflicts:
    	Source/Categories/NSManagedObjectContext+MagicalRecord.m
    	Source/Categories/NSManagedObjectModel+MagicalRecord.m
    	Source/Categories/NSPersistentStore+MagicalRecord.m
    	Source/Categories/NSPersistentStoreCoordinator+MagicalRecord.m
    	Source/MagicalRecordHelpers.m

commit 667738a6c1bdedefd57da2d93298e498d5b716a4
Merge: 7567e75 260d86c
Author: Magical Panda Software <saul@magicalpanda.com>
Date:   Mon Dec 12 22:35:23 2011 -0800

    Merge pull request #108 from tonyarnold/master

    Fix clang warning in NSManagedObjectContext category

commit 260d86c5e17a6f008230f52b569494875bd064c6
Author: Tony Arnold <tony@thecocoabots.com>
Date:   Tue Dec 13 17:10:01 2011 +1100

    Fix clang warning

    Clang seems to need the diagnostic pragma to cover the
    `THREAD_ISOLATION_ENABLED()` macro as well as the `performSelector:`
    method to suppress this warning.

commit 7567e75e17bed50a25b1e415d2e74e35ef039e81
Author: Saul Mora <saul@magicalpanda.com>
Date:   Sun Dec 11 14:24:14 2011 -0700

    Fix crash when setting main context as parent in background on iOS5
    Readd (again) checks for iCloud changes to background contexts

commit bc4ae8102365862f67f85a40394a5f5f7d19668d
Author: Saul Mora <saul@magicalpanda.com>
Date:   Sun Dec 11 14:02:13 2011 -0700

    Fix compile error for assoc. reference key
    re-compiled entities with latest version of mogenerator

commit b446251c21c0614a5e5d696652208fee91bb4eb2
Merge: be9d5c4 9a3c389
Author: Saul Mora <saul@magicalpanda.com>
Date:   Sun Dec 11 13:29:02 2011 -0700

    Merge https://github.com/crayment/MagicalRecord into log-in-debug

    Conflicts:
    	Source/Categories/NSPersistentStore+MagicalRecord.m
    	Source/Categories/NSPersistentStoreCoordinator+MagicalRecord.m
    	Source/CoreData+MagicalRecord.h

commit be9d5c44ee1086fc7eeb6e0af5b6043fd6124f1d
Author: Saul Mora <saul@magicalpanda.com>
Date:   Sun Dec 11 13:19:08 2011 -0700

    Include all sub entities by default when deleting using a predicate

commit 52aaff948727ac3785819266803ae3dbfbf2cee0
Author: Saul Mora <saul@magicalpanda.com>
Date:   Sun Dec 11 13:16:46 2011 -0700

    Adjusting tests for context notifications to depend on which platform is running.

commit 6e2cfd8151ef742a35297d17b5fbf2bc920ee1a9
Merge: a689dfe abb22be
Author: Saul Mora <saul@magicalpanda.com>
Date:   Sun Dec 11 13:05:26 2011 -0700

    Merge branch 'master' of magicalpanda.github.com:magicalpanda/MagicalRecord

commit a689dfe612f61ae539f02600fc926c5d12b3b3f4
Author: Saul Mora <saul@magicalpanda.com>
Date:   Sun Dec 11 13:05:15 2011 -0700

    Fix broken tests on iOS4.3 and iOS5
    Fix data import on iOS4.3

commit abb22bebdc2a238331595b716043cbe8fc4c7405
Merge: 8938488 6d94f4a
Author: Magical Panda Software <saul@magicalpanda.com>
Date:   Sun Dec 11 09:48:31 2011 -0800

    Merge pull request #107 from SeriousMonster/6d94f4ae1b2c460d06c2fa1793e655026e55986a

    completed shorthand support for aggregate methods by updating shorthand file

commit 6d94f4ae1b2c460d06c2fa1793e655026e55986a
Author: Duane Fields <duane@duanefields.com>
Date:   Sun Dec 11 11:00:34 2011 -0600

    added aggregate methods to shorthand file

commit aba82b26192b34074c099dc3d459966ded7cb784
Author: Duane Fields <duane@duanefields.com>
Date:   Sat Dec 10 14:05:02 2011 -0600

    added aggregate methods to the category header and renamed to use MR_ prefix

commit 07538d5a1a0d60aace0e55ee57e6b26fc85b6c2f
Author: Saul Mora <saul@magicalpanda.com>
Date:   Sat Dec 10 10:32:23 2011 -0700

    Fix: Set the default store properly when creating a new default context

commit 6de353f3d1d0540dd1f34ca909a86a7550ab67f3
Author: Saul Mora <saul@magicalpanda.com>
Date:   Sat Dec 10 10:31:47 2011 -0700

    Refactor tests to use property name different from super class

commit 78262cbad7c489dc0ed740a9b42f2c2693a963dc
Author: Saul Mora <saul@magicalpanda.com>
Date:   Sat Dec 10 10:31:11 2011 -0700

    Fix: extract NSString categories to external file

commit 8938488d2e26c92474e501deb4e674ade2ec9e7e
Author: Saul Mora <saul@magicalpanda.com>
Date:   Thu Dec 8 12:55:17 2011 -0700

    Fix Core Foundation version number.
    Merge from lgaches/MagicalRecord@25e5029 was overwritten somehow too :(

commit 3cf33f47ae6bc3158be2346fa0c22cd013749d60
Author: Saul Mora <saul@magicalpanda.com>
Date:   Thu Dec 8 12:52:48 2011 -0700

    Check for iCloud in particular operations

commit db986748c4b35ebb4287f90731261f0d16016591
Author: Saul Mora <saul@magicalpanda.com>
Date:   Thu Dec 8 12:38:10 2011 -0700

    Using descriptive macros to help imply reason for certain method calls, ie. initWithConcurrencyType:

commit ac1135c23a4ab6c8244737baa056d7e1aeae86b0
Merge: 5b1442e 0dc65ac
Author: Saul Mora <saul@magicalpanda.com>
Date:   Thu Dec 8 12:24:49 2011 -0700

    merging fixes for iOS4

commit 38f12c500d983869d49225fdc071848a7aac237e
Author: Saul Mora <saul@magicalpanda.com>
Date:   Thu Dec 8 12:20:52 2011 -0700

    Fix crashes for iOS4

commit 2d1c1231a104035fc94d094fc34f4bc700262790
Merge: 5b1442e 25e5029
Author: Saul Mora <saul@magicalpanda.com>
Date:   Thu Dec 8 12:15:25 2011 -0700

    Merge https://github.com/lgaches/MagicalRecord into merge-pull-requests

commit 5b1442ed1b81fcb9f204126997b3d224894bc2d2
Merge: 0a76291 81ba7e4
Author: Saul Mora <saul@magicalpanda.com>
Date:   Thu Dec 8 10:47:52 2011 -0700

    Merge branch 'master' of magicalpanda.github.com:magicalpanda/MagicalRecord

commit 81ba7e4cc49424fbcf0b35f325d26870fb411aeb
Merge: 64f8b6d d698e27
Author: Magical Panda Software <saul@magicalpanda.com>
Date:   Thu Dec 8 09:45:42 2011 -0800

    Merge pull request #97 from pjaspers/patch-1

    Variable typo. Thanks, I must have merged a couple different local branches I had...

commit 0a762917c3c3e8e827be950acec63452213660b9
Merge: 911686c 64f8b6d
Author: Saul Mora <saul@magicalpanda.com>
Date:   Thu Dec 8 10:38:03 2011 -0700

    Merge branch 'master' of magicalpanda.github.com:magicalpanda/MagicalRecord

commit 25e502916487293d1519fdd120802f541430b689
Author: Laurent Gaches <laurent.gaches@gmail.com>
Date:   Thu Dec 8 17:58:53 2011 +0100

    iCloud is only iOS 5

    Crash on iOS 4. Execute iCloud code only on iOS 5.

commit d698e27c2570896b0f407b192b1ed153ec01b431
Author: Piet Jaspers <junkiesxl@gmail.com>
Date:   Thu Dec 8 16:48:57 2011 +0100

    Forgot one.

commit 5ed2c380ebf9671885be184d5405f0c0643e3609
Author: Piet Jaspers <junkiesxl@gmail.com>
Date:   Thu Dec 8 16:38:01 2011 +0100

    Variable typo

    Since coordinator is used in the rest of the file (instead of psc), I went for
    coordinator

commit 9a3c38903eb704cda941a11f32168fcb4560c6a2
Merge: ae36a95 8c75ec6
Author: Cody Rayment <crayment16@gmail.com>
Date:   Wed Dec 7 09:58:00 2011 -0700

    Merge branch 'bugfix/fix_errors_and_warnings_under_non_arc'

commit 8c75ec620d3280b5357813b5e1284e3268191e6f
Author: Cody Rayment <crayment16@gmail.com>
Date:   Wed Dec 7 09:57:43 2011 -0700

    Can not use MR_AUTORELEASE like normal autorelease.

commit ae36a95850f1eb5d4f3287e8e0a05b4733c21745
Merge: 1d63691 da50cdc
Author: Cody Rayment <crayment16@gmail.com>
Date:   Wed Dec 7 08:26:15 2011 -0700

    Merge branch 'feature/auto_detect_arc'

commit da50cdc9454c3669e265e1c5e1060175e7bc9366
Author: Cody Rayment <crayment16@gmail.com>
Date:   Wed Dec 7 08:14:35 2011 -0700

    Use __has_feature(objc_arc) over __has_feature(objc_arr)

commit 480c475ae9bbd1d5c264a209d10f390d5ebb36d5
Author: Cody Rayment <crayment16@gmail.com>
Date:   Wed Dec 7 06:25:48 2011 -0700

    Simplify logic for auto-detecting ARC

commit 1d636910118f5b9843fcb4c12d813f219ffb7a2c
Author: Cody Rayment <crayment16@gmail.com>
Date:   Wed Dec 7 06:25:48 2011 -0700

    Simplify logic for auto-detecting ARC

commit b04a088edaf891b4975221dddd8ab56c02d31268
Merge: df9e704 93c9cce
Author: Cody Rayment <crayment16@gmail.com>
Date:   Wed Dec 7 05:07:58 2011 -0700

    Merge branch 'feature/define_cleanup'

commit df9e70484c3393240188e60ddae751ee53459226
Merge: 681b428 911fd89
Author: Cody Rayment <crayment16@gmail.com>
Date:   Wed Dec 7 05:07:53 2011 -0700

    Merge branch 'feature/log_in_debug_only'

commit 681b428a5589edfac73cc19e522a7e504c61875e
Merge: 04d6861 17e215e
Author: Cody Rayment <crayment16@gmail.com>
Date:   Wed Dec 7 05:07:40 2011 -0700

    Merge branch 'feature/auto_detect_arc'

commit 04d686105684447d0f2f3434ef5d09063d393886
Author: Cody Rayment <crayment16@gmail.com>
Date:   Wed Dec 7 04:20:01 2011 -0700

    Fix all compile errors and analyzer warnings.

    These could only be seen under non-ARC and are real issues.

commit 17e215e7909eda78c14bd909709d05a17dc43de4
Author: Cody Rayment <crayment16@gmail.com>
Date:   Wed Dec 7 05:01:02 2011 -0700

    Auto-detect ARC.

commit 93c9ccec53843f6a78961c27fa4cf8b3f82dc70b
Author: Cody Rayment <crayment16@gmail.com>
Date:   Wed Dec 7 04:41:06 2011 -0700

    Don't need ((void)0)'s

commit 911fd89eae983f0acacc4a1b8d1f5e4ce1eea452
Author: Cody Rayment <crayment16@gmail.com>
Date:   Wed Dec 7 04:35:22 2011 -0700

    Default to only log in debug builds.

commit 64f8b6d59c245db02f8fd2eef494c2aa82a5bf1b
Author: Saul Mora <saul@casademora.com>
Date:   Mon Dec 5 20:48:15 2011 -0700

    Fixed compile problems and merge issues

commit c8ffde36b4a3948b0d66b16e8c2387d3a98e7123
Merge: 10a3fec 18d984e
Author: Saul Mora <saul@casademora.com>
Date:   Mon Dec 5 20:42:07 2011 -0700

    Merged from pull request

commit 18d984e363b8878d9d6d7a0e5df729e30d91250c
Merge: 1ad46a7 3dd7591
Author: Magical Panda Software <saul@magicalpanda.com>
Date:   Mon Dec 5 18:26:27 2011 -0800

    Merge pull request #93 from NZKoz/master

    Fixes for the MR_* macros when ARC is not enabled.

commit 3dd7591d189377af90914b65ca1cb0df7ec76279
Author: Michael Koziarski <michael@koziarski.com>
Date:   Tue Dec 6 15:21:40 2011 +1300

    Default to using ARC

commit 2bcd11706980ad461de427992dc2f9856f2fc823
Author: Michael Koziarski <michael@koziarski.com>
Date:   Tue Dec 6 14:38:20 2011 +1300

    Add an MR_USE_ARC option that users can define themselves if they use arc

commit d1af0058f7787011eeee867d9ae4ddbd3dda6359
Author: Michael Koziarski <michael@koziarski.com>
Date:   Tue Dec 6 14:37:55 2011 +1300

    use the MR_RETAIN/MR_RELEASE/MR_AUTORELEASE macros everywhere

commit 0dc65ac71493f4b0e004d53f61458a4c96e9ef1e
Merge: f172256 bba28d6
Author: Saul Mora <saul@magicalpanda.com>
Date:   Sun Dec 4 13:10:58 2011 -0500

    Merge branch 'preprocessor_fixes' of https://github.com/baron/MagicalRecord into merge-pull-request

commit bba28d6c816ac5e855dd80984c678fbe2ec1895c
Author: Sam Baron <richstyles@gmail.com>
Date:   Sat Dec 3 22:00:12 2011 +0900

    fix indentation

commit cfb19422bb2c75cb5019cedd8f0a6612a1f73b34
Author: Sam Baron <richstyles@gmail.com>
Date:   Sat Dec 3 21:56:31 2011 +0900

    fixes for preprocessor stuff for ARC

Signed-off-by: Alexsander Akers <a2@pandamonia.us>
bd226cc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 1 unique commit by 1 author.

Dec 13, 2011
Tony Arnold tonyarnold Fix clang warning
Clang seems to need the diagnostic pragma to cover the
`THREAD_ISOLATION_ENABLED()` macro as well as the `performSelector:`
method to suppress this warning.
260d86c
This page is out of date. Refresh to see the latest.
9 Source/Categories/NSManagedObjectContext+MagicalRecord.m
@@ -238,15 +238,16 @@ - (void) MR_setNotifiesMainContextOnSave:(BOOL)enabled;
238 238 NSManagedObjectContext *mainContext = [[self class] MR_defaultContext];
239 239 if (self != mainContext)
240 240 {
  241 +#pragma clang diagnostic push
  242 +#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
241 243 THREAD_ISOLATION_ENABLED(
242 244 SEL selector = enabled ? @selector(MR_observeContextOnMainThread:) : @selector(MR_stopObservingContext:);
243 245 objc_setAssociatedObject(self, kMagicalRecordNotifiesMainContextAssociatedValueKey, [NSNumber numberWithBool:enabled], OBJC_ASSOCIATION_RETAIN_NONATOMIC);
244   -
245   -#pragma clang diagnostic push
246   -#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
  246 +
247 247 [mainContext performSelector:selector withObject:self];
248   -#pragma clang diagnostic pop
249 248 )
  249 +#pragma clang diagnostic pop
  250 +
250 251 PRIVATE_QUEUES_ENABLED(
251 252 if (enabled)
252 253 {

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.