dbertoni 2002/11/26 09:32:25
Modified: c/Tests/Harness FileUtility.cpp FileUtility.hpp
Log:
Moved typedef inside class.
Revision Changes Path
1.46 +3 -2 xml-xalan/c/Tests/Harness/FileUtility.cpp
Index: FileUtility.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Harness/FileUtility.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- FileUtility.cpp 26 Nov 2002 02:12:27 -0000 1.45
+++ FileUtility.cpp 26 Nov 2002 17:32:24 -0000 1.46
@@ -433,7 +433,7 @@
// Notes: It builds the searchSpecification by concatenating all the
// necessary components.
//
-FileNameVectorType
+FileUtility::FileNameVectorType
FileUtility::getTestFileNames(
const XalanDOMString& baseDir,
const XalanDOMString& relDir,
@@ -466,7 +466,8 @@
//
// Notes: The searchSpecification in this case is just "*".
//
*/
-FileNameVectorType FileUtility::getDirectoryNames(const XalanDOMString&
rootDirectory)
+FileUtility::FileNameVectorType
+FileUtility::getDirectoryNames(const XalanDOMString& rootDirectory)
{
const XalanDOMString dirSpec(XALAN_STATIC_UCODE_STRING("*"));
1.31 +7 -9 xml-xalan/c/Tests/Harness/FileUtility.hpp
Index: FileUtility.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Harness/FileUtility.hpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- FileUtility.hpp 26 Nov 2002 02:12:27 -0000 1.30
+++ FileUtility.hpp 26 Nov 2002 17:32:24 -0000 1.31
@@ -82,15 +82,6 @@
-// Misc typedefs and Global variables.
-// These structures hold vectors of directory names and file names.
-#if defined(XALAN_NO_STD_NAMESPACE)
- typedef vector<XalanDOMString> FileNameVectorType;
-#else
- typedef std::vector<XalanDOMString> FileNameVectorType;
-#endif
-
-
class FormatterListener;
class PrintWriter;
class StylesheetRoot;
@@ -107,6 +98,13 @@
class HARNESS_API FileUtility
{
public:
+
+// A vector to hold directory names and file names.
+#if defined(XALAN_NO_STD_NAMESPACE)
+ typedef vector<XalanDOMString> FileNameVectorType;
+#else
+ typedef std::vector<XalanDOMString> FileNameVectorType;
+#endif
/**
* Initialize static data.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
