commit 8dba591d45f654863ed7b1cc562d0781c8a1028a
author Peter Eberlein <peberlein@apache.org> Mon Jul 01 06:47:51 2013 +0000
committer Peter Eberlein <peberlein@apache.org> Mon Jul 01 06:47:51 2013 +0000
tree 73adc71eda3708692b82a06c1b8265ed109e8f9b
parent 447b7b432841c43ecc0d9e2c6ac29af742223c65

Moved CMISLog macros back to CMISLog.h but guarded them with #if !defined. As a results, consumers do not need to add own CMISLog macros to their .pch but they can if they wish to.

git-svn-id: https://svn.apache.org/repos/asf/chemistry/objectivecmis/trunk@1498256 13f79535-47bb-0310-9956-ffa450edef68

ObjectiveCMIS/ObjectiveCMIS-Prefix.pch

diff --git a/ObjectiveCMIS/ObjectiveCMIS-Prefix.pch b/ObjectiveCMIS/ObjectiveCMIS-Prefix.pch
index dcbf140..fb1db83 100644
--- a/ObjectiveCMIS/ObjectiveCMIS-Prefix.pch
+++ b/ObjectiveCMIS/ObjectiveCMIS-Prefix.pch
@@ -23,14 +23,3 @@
 #ifdef __OBJC__
     #import <Foundation/Foundation.h>
 #endif
-
-
-/**
- * log macros
- */
-#define CMISLogError(...)   [[CMISLog sharedInstance] logError:__VA_ARGS__]
-#define CMISLogWarning(...) [[CMISLog sharedInstance] logWarning:__VA_ARGS__]
-#define CMISLogInfo(...)    [[CMISLog sharedInstance] logInfo:__VA_ARGS__]
-#define CMISLogDebug(...)   [[CMISLog sharedInstance] logDebug:__VA_ARGS__]
-#define CMISLogTrace(...)   [[CMISLog sharedInstance] logTrace:__VA_ARGS__]
-

ObjectiveCMIS/Utils/CMISLog.h

diff --git a/ObjectiveCMIS/Utils/CMISLog.h b/ObjectiveCMIS/Utils/CMISLog.h
index 9261358..1f98fb8 100644
--- a/ObjectiveCMIS/Utils/CMISLog.h
+++ b/ObjectiveCMIS/Utils/CMISLog.h
@@ -13,14 +13,35 @@
  */
 
 /**
- * Default logging level
+ * Default logging macros and log level
  *
+ * The default logging writes to NSLog.
  * The default logging level is Info for release builds and Debug for debug builds.
- * The recommended way to override the default is to #include this header file in your app's .pch file
+ * The recommended way to override the default is to #import this header file in your app's .pch file
  * and then redefine the CMIS_LOG_LEVEL macro to suit, e.g.
  *     #undef CMIS_LOG_LEVEL
  *     #define CMIS_LOG_LEVEL CMISLogLevelTrace
  */
+#if !defined(CMISLogError)
+    #define CMISLogError(...)   [[CMISLog sharedInstance] logError:__VA_ARGS__]
+#endif
+
+#if !defined(CMISLogWarning)
+    #define CMISLogWarning(...) [[CMISLog sharedInstance] logWarning:__VA_ARGS__]
+#endif
+
+#if !defined(CMISLogInfo)
+    #define CMISLogInfo(...)    [[CMISLog sharedInstance] logInfo:__VA_ARGS__]
+#endif
+
+#if !defined(CMISLogDebug)
+    #define CMISLogDebug(...)   [[CMISLog sharedInstance] logDebug:__VA_ARGS__]
+#endif
+
+#if !defined(CMISLogTrace)
+    #define CMISLogTrace(...)   [[CMISLog sharedInstance] logTrace:__VA_ARGS__]
+#endif
+
 #if !defined(CMIS_LOG_LEVEL)
     #if DEBUG
         #define CMIS_LOG_LEVEL CMISLogLevelDebug