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
magicalpanda · Dec 11, 2011 · b446251 · b446251
2 parents be9d5c4 + 9a3c389
commit b446251
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/Source/CoreData+MagicalRecord.h b/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