Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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
  • Loading branch information...
commit b446251c21c0614a5e5d696652208fee91bb4eb2 2 parents be9d5c4 + 9a3c389
@casademora casademora authored
Showing with 9 additions and 1 deletion.
  1. +9 −1 Source/CoreData+MagicalRecord.h
View
10 Source/CoreData+MagicalRecord.h
@@ -4,7 +4,15 @@
#define kCreateNewCoordinatorOnBackgroundOperations 0
-#ifdef MR_ENABLE_LOGGING
+#ifndef MR_ENABLE_ACTIVE_RECORD_LOGGING
+ #ifdef DEBUG
+ #define MR_ENABLE_ACTIVE_RECORD_LOGGING 1
+ #else
+ #define MR_ENABLE_ACTIVE_RECORD_LOGGING 0
+ #endif
+#endif
+
+#if MR_ENABLE_ACTIVE_RECORD_LOGGING
#ifdef LOG_VERBOSE
#define MRLog(...) DDLogVerbose(__VA_ARGS__)
#else
Please sign in to comment.
Something went wrong with that request. Please try again.