mhoyt 2004/11/24 13:47:59
Modified: c Makefile.incl.in
c/src/xalanc/Include XalanMap.hpp
Log:
Fix to enable build on HP-UX/aCC - workaround symbol length limit
Revision Changes Path
1.26 +4 -1 xml-xalan/c/Makefile.incl.in
Index: Makefile.incl.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/Makefile.incl.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Makefile.incl.in 11 Nov 2004 16:20:39 -0000 1.25
+++ Makefile.incl.in 24 Nov 2004 21:47:59 -0000 1.26
@@ -255,7 +255,10 @@
SUPPORTED = TRUE
PLATFORM_COMPILE_OPTIONS = +Z -D${PLATFORM} -D_THREAD_SAFE
- PLATFORM_CXX_COMPILE_OPTIONS = +p -mt -Wc,-koenig_lookup,on
-Wc,-ansi_for_scope,on
+ # +p option removed, +W849 option added
+ # to avoid error created by instantiated template symbol length limiation.
+ PLATFORM_CXX_COMPILE_OPTIONS = +W849 -mt -Wc,-koenig_lookup,on
-Wc,-ansi_for_scope,on
+
ALLLIBS = ${LIBS}
SHLIBSUFFIX=.sl
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
$(PLATFORM_CXX_COMPILE_OPTIONS)
1.18 +3 -7 xml-xalan/c/src/xalanc/Include/XalanMap.hpp
Index: XalanMap.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Include/XalanMap.hpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- XalanMap.hpp 19 Nov 2004 23:24:46 -0000 1.17
+++ XalanMap.hpp 24 Nov 2004 21:47:59 -0000 1.18
@@ -91,10 +91,6 @@
}
};
-/**
- * Xalan map entry pair of a key and data
- */
-
template <class Value>
@@ -276,7 +272,7 @@
if (!m_buckets.empty())
{
- EntryListType::iterator toRemove = m_freeEntries.begin();
+ typename EntryListType::iterator toRemove =
m_freeEntries.begin();
while(toRemove != m_freeEntries.end())
{
deallocate(toRemove->value);
@@ -407,7 +403,7 @@
{
doRemoveEntries();
- BucketTableType::iterator bucketPos = m_buckets.begin();
+ typename BucketTableType::iterator bucketPos =
m_buckets.begin();
while (bucketPos != m_buckets.end())
{
bucketPos->clear();
@@ -520,7 +516,7 @@
m_buckets.swap(temp);
// rehash each entry assign to bucket and insert into list
- EntryListType::iterator entryPos = m_entries.begin();
+ typename EntryListType::iterator entryPos = m_entries.begin();
while (entryPos != m_entries.end())
{
size_type index = doHash(entryPos->value->first);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
