[ZooLib-checkins] CVS: zoolib/src/file ZUtil_File.cpp, 1.22, 1.23 ZUtil_File.h, 1.10, 1.11

[Michael D. C. <goi...@us...>]

Update of /cvsroot/zoolib/zoolib/src/file
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27853

Modified Files:
	ZUtil_File.cpp ZUtil_File.h 
Log Message:
Remove explicit use of std namespace.  I didn't realize we had pulled
std into the global namespace.


Index: ZUtil_File.cpp
===================================================================
RCS file: /cvsroot/zoolib/zoolib/src/file/ZUtil_File.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- ZUtil_File.cpp	18 Aug 2009 12:53:35 -0000	1.22
+++ ZUtil_File.cpp	22 Sep 2009 03:32:00 -0000	1.23
@@ -25,6 +25,7 @@
 #include "ZUtil_File.h"
 
 // =================================================================================================
+#pragma mark "Mac OS X"
 
 #if ZCONFIG_API_Enabled(File_POSIX) && ZCONFIG( OS, MacOSX )
 
@@ -33,7 +34,12 @@
 #include <AE/AppleEvents.h>
 #include <NavigationServices/Navigation.h>
 
+/*
 using std::exception;
+using std::vector;
+using std::pair;
+using std::string;
+*/
 
 namespace ZUtil_File{
 
@@ -276,6 +282,9 @@
 	return result;}
 
 }
+
+#pragma mark "Mac Classic"
+
 #elif ZCONFIG_API_Enabled(File_MacClassic)
 
 #include "ZMemory.h"
@@ -516,6 +525,8 @@
 
 // =================================================================================================
 
+#pragma mark "Windows"
+
 #if ZCONFIG_API_Enabled(File_Win)
 
 #include "ZHandle.h"

Index: ZUtil_File.h
===================================================================
RCS file: /cvsroot/zoolib/zoolib/src/file/ZUtil_File.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ZUtil_File.h	18 Aug 2009 12:53:35 -0000	1.10
+++ ZUtil_File.h	22 Sep 2009 03:32:00 -0000	1.11
@@ -26,6 +26,8 @@
 #define __ZUtil_File__
 #include "zconfig.h"
 
+#include <utility>
+
 #include "ZFile_MacClassic.h"
 #include "ZFile_Win.h"
 #include "ZFile_POSIX.h"