You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by jd...@locus.apache.org on 2000/02/22 18:33:34 UTC
cvs commit: xml-xalan/c/src/PlatformSupport DOMStringHelper.cpp DOMStringHelper.hpp DOMStringPrintWriter.hpp DirectoryEnumerator.hpp DoubleSupport.cpp Writer.hpp
jdonohue 00/02/22 09:33:34
Modified: c/src/Include GCCDefinitions.hpp
c/src/PlatformSupport DOMStringHelper.cpp
DOMStringHelper.hpp DOMStringPrintWriter.hpp
DirectoryEnumerator.hpp DoubleSupport.cpp
Writer.hpp
Log:
Linux changes
Revision Changes Path
1.2 +4 -3 xml-xalan/c/src/Include/GCCDefinitions.hpp
Index: GCCDefinitions.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Include/GCCDefinitions.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GCCDefinitions.hpp 2000/02/17 16:15:44 1.1
+++ GCCDefinitions.hpp 2000/02/22 17:33:30 1.2
@@ -70,13 +70,14 @@
#define XALAN_PLATFORM_EXPORT_FUNCTION(T) T XALAN_PLATFORM_EXPORT
#define XALAN_PLATFORM_IMPORT_FUNCTION(T) T XALAN_PLATFORM_IMPORT
-
-
#define XALAN_NO_MEMBER_TEMPLATES
#define XALAN_OLD_AUTO_PTR
#define XALAN_NO_COVARIANT_RETURN_TYPE
#define XALAN_NEED_SPECIAL_NAN_SUPPORT
+#define NO_STD_LIMITS
+#define XALAN_WIDE_STRING_UCODE_PROBLEM
+#define XALAN_XTREE_BUG
-#endif // VCPPDEFINITIONS_HEADER_GUARD_1357924680
+#endif // GCCDEFINITIONS_HEADER_GUARD_1357924680
1.11 +0 -1 xml-xalan/c/src/PlatformSupport/DOMStringHelper.cpp
Index: DOMStringHelper.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/DOMStringHelper.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DOMStringHelper.cpp 2000/02/18 20:33:46 1.10
+++ DOMStringHelper.cpp 2000/02/22 17:33:31 1.11
@@ -67,7 +67,6 @@
#include <strstream>
-#include <ostream>
#include <vector>
1.8 +0 -1 xml-xalan/c/src/PlatformSupport/DOMStringHelper.hpp
Index: DOMStringHelper.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/DOMStringHelper.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DOMStringHelper.hpp 2000/02/17 20:27:26 1.7
+++ DOMStringHelper.hpp 2000/02/22 17:33:31 1.8
@@ -67,7 +67,6 @@
#include <cassert>
#include <functional>
#include <iosfwd>
-#include <limits>
#include <vector>
#include <string>
1.3 +0 -1 xml-xalan/c/src/PlatformSupport/DOMStringPrintWriter.hpp
Index: DOMStringPrintWriter.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/DOMStringPrintWriter.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DOMStringPrintWriter.hpp 2000/02/17 20:27:26 1.2
+++ DOMStringPrintWriter.hpp 2000/02/22 17:33:31 1.3
@@ -64,7 +64,6 @@
-#include <limits>
1.4 +43 -40 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DirectoryEnumerator.hpp 2000/02/17 20:27:26 1.3
+++ DirectoryEnumerator.hpp 2000/02/22 17:33:31 1.4
@@ -91,6 +91,7 @@
#if defined(_MSC_VER)
class FindFileStruct : public _wfinddata_t
{
+
public:
enum eAttributes
@@ -103,29 +104,6 @@
eSystem = _A_SYSTEM
};
-#elif defined(__GNUC__)
-
-class FindFileStruct
-{
-public:
-
- XMLCh m_name[MAXNAMLEN];
- int m_attrib;
-
- enum eAttributes
- {
- eAttributeArchive = 1,
- eAttributeDirectory = 2,
- eAttributeHidden = 4,
- eAttributeNormal = 8,
- eReadOnly = 16,
- eSystem = 32
- };
-
-#else
-#error Unsupported platform!!!
-#endif
-
const XMLCh*
getName() const
{
@@ -170,21 +148,28 @@
};
+#elif defined(__GNUC__)
-#if defined(XALAN_NO_NAMESPACES)
-struct ArchiveFileFilterPredicate : public unary_function<FindFileStruct, bool>
-#else
-struct ArchiveFileFilterPredicate : public std::unary_function<FindFileStruct, bool>
-#endif
+class FindFileStruct : public dirent
{
- result_type
- operator()(const argument_type& theFindData) const
+public:
+
+ const char* getName() const
{
- return theFindData.isArchive();
+ return d_name;
}
+
+ bool isDirectory() const
+ {
+ return d_type == DT_DIR;
+ }
};
+#else
+#error Unsupported platform!!!
+#endif
+
#if defined(XALAN_NO_NAMESPACES)
struct DirectoryFilterPredicate : public unary_function<FindFileStruct, bool>
@@ -200,6 +185,23 @@
};
+// Only defined for Windows platform thus far
+
+#if defined(_MSC_VER)
+
+
+#if defined(XALAN_NO_NAMESPACES)
+struct ArchiveFileFilterPredicate : public unary_function<FindFileStruct, bool>
+#else
+struct ArchiveFileFilterPredicate : public std::unary_function<FindFileStruct, bool>
+#endif
+{
+ result_type
+ operator()(const argument_type& theFindData) const
+ {
+ return theFindData.isArchive();
+ }
+};
#if defined(XALAN_NO_NAMESPACES)
struct HiddenFileFilterPredicate : public unary_function<FindFileStruct, bool>
@@ -214,8 +216,6 @@
}
};
-
-
#if defined(XALAN_NO_NAMESPACES)
struct NormalFileFilterPredicate : public unary_function<FindFileStruct, bool>
#else
@@ -229,8 +229,6 @@
}
};
-
-
#if defined(XALAN_NO_NAMESPACES)
struct ReadOnlyFileFilterPredicate : public unary_function<FindFileStruct, bool>
#else
@@ -244,8 +242,6 @@
}
};
-
-
#if defined(XALAN_NO_NAMESPACES)
struct SystemFileFilterPredicate : public unary_function<FindFileStruct, bool>
#else
@@ -259,6 +255,8 @@
}
};
+#endif // defined(_MSC_VER)
+
#if defined(XALAN_NO_NAMESPACES)
@@ -270,19 +268,24 @@
result_type
operator()(const argument_type& theFindData) const
{
+#if defined(_MSC_VER)
DirectoryFilterPredicate theDirectoryPredicate;
ArchiveFileFilterPredicate theArchivePredicate;
NormalFileFilterPredicate theNormalPredicate;
ReadOnlyFileFilterPredicate theReadOnlyPredicate;
- return !theDirectoryPredicate(theFindData) &&
- (theArchivePredicate(theFindData) ||
+ return !theDirectoryPredicate(theFindData)
+ && (theArchivePredicate(theFindData) ||
theNormalPredicate(theFindData) ||
theReadOnlyPredicate(theFindData));
+#else
+ DirectoryFilterPredicate theDirectoryPredicate;
+
+ return !theDirectoryPredicate(theFindData);
+#endif
}
};
-
template<class OutputIteratorType,
1.4 +1 -1 xml-xalan/c/src/PlatformSupport/DoubleSupport.cpp
Index: DoubleSupport.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/DoubleSupport.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DoubleSupport.cpp 2000/02/17 20:27:26 1.3
+++ DoubleSupport.cpp 2000/02/22 17:33:31 1.4
@@ -62,7 +62,7 @@
#include <math.h>
// @@ JMD: Shouldn't need this as well ??
#include <bits/nan.h>
-else
+#else
#error Unsupported platform!!!
#endif
#else
1.3 +1 -1 xml-xalan/c/src/PlatformSupport/Writer.hpp
Index: Writer.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/Writer.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Writer.hpp 2000/02/17 20:27:26 1.2
+++ Writer.hpp 2000/02/22 17:33:31 1.3
@@ -64,7 +64,7 @@
-#include <limits>
+#include <climits>