You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2009/03/28 18:39:04 UTC
svn commit: r759516 - in /xalan/c/trunk: Tests/Performance/
samples/XalanTransformerCallback/ src/xalanc/Harness/ src/xalanc/Include/
src/xalanc/PlatformSupport/ src/xalanc/Utils/MsgCreator/ src/xalanc/XSLT/
Author: dbertoni
Date: Sat Mar 28 17:39:04 2009
New Revision: 759516
URL: http://svn.apache.org/viewvc?rev=759516&view=rev
Log:
Fixes for building on Solaris with Sun Workshop and STLport 4.
Modified:
xalan/c/trunk/Tests/Performance/perf.cpp
xalan/c/trunk/samples/XalanTransformerCallback/XalanTransformerCallback.cpp
xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp
xalan/c/trunk/src/xalanc/Harness/XalanXMLFileReporter.cpp
xalan/c/trunk/src/xalanc/Include/SolarisDefinitions.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/DoubleSupport.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.hpp
xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.cpp
xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp
Modified: xalan/c/trunk/Tests/Performance/perf.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Tests/Performance/perf.cpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/Tests/Performance/perf.cpp (original)
+++ xalan/c/trunk/Tests/Performance/perf.cpp Sat Mar 28 17:39:04 2009
@@ -30,6 +30,12 @@
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+using std::strcmp;
+#endif
+
+
+
#include <xercesc/util/PlatformUtils.hpp>
Modified: xalan/c/trunk/samples/XalanTransformerCallback/XalanTransformerCallback.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/XalanTransformerCallback/XalanTransformerCallback.cpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/samples/XalanTransformerCallback/XalanTransformerCallback.cpp (original)
+++ xalan/c/trunk/samples/XalanTransformerCallback/XalanTransformerCallback.cpp Sat Mar 28 17:39:04 2009
@@ -34,6 +34,16 @@
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+using std::FILE;
+using std::fclose;
+using std::fflush;
+using std::fopen;
+using std::fwrite;
+#endif
+
+
+
// This is a simple class that illustrates how XalanTransformer's "callback" API
// is used. This example just abstracts writing data to a FILE*, but other
// actions are possible.
Modified: xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp (original)
+++ xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp Sat Mar 28 17:39:04 2009
@@ -58,6 +58,21 @@
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+using std::fclose;
+using std::feof;
+using std::ferror;
+using std::fgets;
+using std::fopen;
+using std::localtime;
+using std::sprintf;
+using std::strftime;
+using std::tm;
+using std::time;
+#endif
+
+
+
#include "xercesc/sax/ErrorHandler.hpp"
#include "xercesc/sax/SAXException.hpp"
#include "xercesc/sax/SAXParseException.hpp"
@@ -628,13 +643,6 @@
XalanDOMString&
XalanFileUtility::generateUniqRunid(XalanDOMString& theResult)
{
-#if defined(XALAN_STRICT_ANSI_HEADERS)
- using std::tm;
- using std::time;
- using std::localtime;
- using std::strftime;
-#endif
-
struct tm *newtime;
time_t long_time;
char tmpbuf[10];
Modified: xalan/c/trunk/src/xalanc/Harness/XalanXMLFileReporter.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Harness/XalanXMLFileReporter.cpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Harness/XalanXMLFileReporter.cpp (original)
+++ xalan/c/trunk/src/xalanc/Harness/XalanXMLFileReporter.cpp Sat Mar 28 17:39:04 2009
@@ -37,6 +37,17 @@
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+using std::fclose;
+using std::fflush;
+using std::fopen;
+using std::fprintf;
+using std::fputs;
+using std::sprintf;
+#endif
+
+
+
XalanOutputTranscoder*
makeNewUTF8Transcoder(MemoryManager& theMemoryManager)
{
@@ -921,14 +932,6 @@
XalanDOMString &
XalanXMLFileReporter::getDateTimeString(XalanDOMString& theResult)
{
-#if defined(XALAN_STRICT_ANSI_HEADERS)
- using std::tm;
- using std::time;
- using std::localtime;
- using std::asctime;
- using std::strlen;
-#endif
-
struct tm *tmNow;
time_t time_tNow;
Modified: xalan/c/trunk/src/xalanc/Include/SolarisDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/SolarisDefinitions.hpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/SolarisDefinitions.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/SolarisDefinitions.hpp Sat Mar 28 17:39:04 2009
@@ -35,7 +35,12 @@
#define XALAN_HAS_CPP_NAMESPACE
#define XALAN_STRICT_ANSI_HEADERS
+#if defined(_STLP_CONFIG_H)
+#define XALAN_HAS_STD_ITERATORS
+#define XALAN_HAS_STD_DISTANCE
+#else
#define XALAN_RW_NO_CLASS_PARTIAL_SPEC
+#endif
#define XALAN_POSIX2_AVAILABLE
#if defined(__sparc)
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/DoubleSupport.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/DoubleSupport.hpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/DoubleSupport.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/DoubleSupport.hpp Sat Mar 28 17:39:04 2009
@@ -28,7 +28,7 @@
#if defined(_MSC_VER)
#include <float.h>
#endif
-#include <cmath>
+#include <math.h>
#include <functional>
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp Sat Mar 28 17:39:04 2009
@@ -86,6 +86,10 @@
const char* theBuffer,
size_type theBufferLength)
{
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+ using std::fwrite;
+#endif
+
const size_t theBytesWritten =
fwrite(theBuffer,
1,
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp Sat Mar 28 17:39:04 2009
@@ -36,7 +36,9 @@
XALAN_CPP_NAMESPACE_BEGIN
-
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+using std::FILE;
+#endif
class XALAN_PLATFORMSUPPORT_EXPORT XalanFStreamOutputStream : public XalanOutputStream
{
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp Sat Mar 28 17:39:04 2009
@@ -168,6 +168,10 @@
}
}
#else
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+ using std::fopen;
+#endif
+
CharVectorType theResult(theManager);
TranscodeToLocalCodePage(theFileName, theResult, true);
@@ -257,6 +261,10 @@
CloseHandle(m_handle);
}
#else
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+ using std::fclose;
+#endif
+
if (m_handle != 0)
{
fclose(m_handle);
@@ -270,9 +278,14 @@
XalanFileOutputStream::doFlush()
{
#if !defined(XALAN_WINDOWS)
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+ using std::fflush;
+#endif
+
if (fflush(m_handle) != 0)
{
- XalanDOMString theBuffer(getMemoryManager());
+ XalanDOMString theBuffer(getMemoryManager());
+
throw XalanFileOutputStreamWriteException(
m_fileName,
errno,
@@ -304,6 +317,10 @@
theExceptionBuffer);
}
#else
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+ using std::fwrite;
+#endif
+
const size_t theBytesWritten =
fwrite(theBuffer,
1,
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.hpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.hpp Sat Mar 28 17:39:04 2009
@@ -41,6 +41,9 @@
XALAN_CPP_NAMESPACE_BEGIN
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+using std::FILE;
+#endif
class XALAN_PLATFORMSUPPORT_EXPORT XalanFileOutputStream : public XalanOutputStream
{
Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.cpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.cpp (original)
+++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.cpp Sat Mar 28 17:39:04 2009
@@ -31,7 +31,9 @@
XALAN_CPP_NAMESPACE_BEGIN
-
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+ using std::sprintf;
+#endif
// -----------------------------------------------------------------------
// Constructors
Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp (original)
+++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp Sat Mar 28 17:39:04 2009
@@ -35,6 +35,9 @@
XALAN_CPP_NAMESPACE_BEGIN
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+ using std::sprintf;
+#endif
XALAN_USING_XERCES(Attributes)
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp Sat Mar 28 17:39:04 2009
@@ -66,6 +66,12 @@
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+using std::FILE;
+#endif
+
+
+
class CountersTable;
class ElemTemplate;
class ElemTemplateElement;
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org