dbertoni 00/05/11 12:01:14
Modified: c/src/PlatformSupport DirectoryEnumerator.hpp
Log:
Rearranged some ifdefs.
Revision Changes Path
1.8 +8 -12 xml-xalan/c/src/PlatformSupport/DirectoryEnumerator.hpp
Index: DirectoryEnumerator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/DirectoryEnumerator.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DirectoryEnumerator.hpp 2000/04/20 16:42:28 1.7
+++ DirectoryEnumerator.hpp 2000/05/11 19:01:14 1.8
@@ -66,10 +66,8 @@
#if defined(_MSC_VER)
#include <io.h>
-#elif defined(__GNUC__)
-#include <dirent.h>
#else
-#error Unsupported platform!!!
+#include <dirent.h>
#endif
@@ -89,6 +87,7 @@
#if defined(_MSC_VER)
+
class FindFileStruct : public _wfinddata_t
{
@@ -128,8 +127,7 @@
};
-
-#elif defined(__GNUC__)
+#else
class FindFileStruct : public dirent
{
@@ -152,16 +150,14 @@
*/
bool isDirectory() const
{
- return d_type == DT_DIR;
+ return d_type == DT_DIR;
}
};
-
-#else
-#error Unsupported platform!!!
#endif
+
#if defined(XALAN_NO_NAMESPACES)
struct DirectoryFilterPredicate : public unary_function<FindFileStruct, bool>
#else
@@ -169,7 +165,7 @@
#endif
{
result_type
- operator()(const argument_type& theFindData) const
+ operator()(const argument_type& theFindData) const
{
return theFindData.isDirectory();
}
@@ -177,7 +173,6 @@
-
#if defined(XALAN_NO_NAMESPACES)
struct FilesOnlyFilterPredicate : public unary_function<FindFileStruct, bool>
#else
@@ -185,7 +180,7 @@
#endif
{
result_type
- operator()(const argument_type& theFindData) const
+ operator()(const argument_type& theFindData) const
{
DirectoryFilterPredicate theDirectoryPredicate;
@@ -193,6 +188,7 @@
}
};
+
template<class OutputIteratorType,
