Author: peberlein
Date: Mon Jul 1 06:47:51 2013
New Revision: 1498256
URL: http://svn.apache.org/r1498256
Log:
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.
Modified:
chemistry/objectivecmis/trunk/ObjectiveCMIS/ObjectiveCMIS-Prefix.pch
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISLog.h
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/ObjectiveCMIS-Prefix.pch
URL:
http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/ObjectiveCMIS-Prefix.pch?rev=1498256&r1=1498255&r2=1498256&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/ObjectiveCMIS-Prefix.pch
(original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/ObjectiveCMIS-Prefix.pch Mon
Jul 1 06:47:51 2013
@@ -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__]
-
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISLog.h
URL:
http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISLog.h?rev=1498256&r1=1498255&r2=1498256&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISLog.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISLog.h Mon Jul 1
06:47:51 2013
@@ -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
