[ZooLib-checkins] SF.net SVN: zoolib:[2636] trunk/zoolib/source/cxx/zoolib/ZUtil_CarbonEvents .cpp

[<ag...@us...>]

Revision: 2636
          http://zoolib.svn.sourceforge.net/zoolib/?rev=2636&view=rev
Author:   agreen
Date:     2011-12-08 08:26:29 +0000 (Thu, 08 Dec 2011)
Log Message:
-----------
Use ZLOGPF.

Modified Paths:
--------------
    trunk/zoolib/source/cxx/zoolib/ZUtil_CarbonEvents.cpp

Modified: trunk/zoolib/source/cxx/zoolib/ZUtil_CarbonEvents.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZUtil_CarbonEvents.cpp	2011-12-06 00:44:34 UTC (rev 2635)
+++ trunk/zoolib/source/cxx/zoolib/ZUtil_CarbonEvents.cpp	2011-12-08 08:26:29 UTC (rev 2636)
@@ -32,10 +32,10 @@
 
 using std::string;
 
-#if !defined(UNIVERSAL_INTERFACES_VERSION) || UNIVERSAL_INTERFACES_VERSION <= 0x0341
+#if defined(UNIVERSAL_INTERFACES_VERSION) && UNIVERSAL_INTERFACES_VERSION > 0x0341
+	#define USING_ANCIENT_HEADERS 0
+#else
 	#define USING_ANCIENT_HEADERS 1
-#else
-	#define USING_ANCIENT_HEADERS 0
 #endif
 
 // =================================================================================================
@@ -68,7 +68,7 @@
 #pragma mark -
 #pragma mark * Handler
 
-namespace {
+namespace { // anonymous
 
 using namespace ZUtil_CarbonEvents;
 
@@ -158,13 +158,13 @@
 		}
 	catch (std::exception& ex)
 		{
-		if (ZLOG(s, eNotice, "Handler"))
-			s << "spEventHandler, uncaught exception: " << ex.what();
+		if (ZLOGPF(s, eNotice))
+			s << "Uncaught exception: " << ex.what();
 		}
 	catch (...)
 		{
-		if (ZLOG(s, eNotice, "Handler"))
-			s << "spEventHandler, uncaught exception, not derived fron std::exception";
+		if (ZLOGPF(s, eNotice))
+			s << "uncaught exception, not derived fron std::exception";
 		}
 	return noErr;
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.