OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Jan-2003 19:20:58
Branch: HEAD Handle: 2003012018205700
Modified files:
openpkg-src/easysoap easysoap.patch easysoap.spec
Log:
Patch even more sources, so that (a) EasySOAP can build, and (b) now it builds
without hideous warnings. There will also be no warnings in code using the
EasySOAP libraries after this.
Summary:
Revision Changes Path
1.2 +115 -0 openpkg-src/easysoap/easysoap.patch
1.9 +1 -1 openpkg-src/easysoap/easysoap.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/easysoap/easysoap.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 easysoap.patch
--- openpkg-src/easysoap/easysoap.patch 10 Dec 2002 15:47:22 -0000 1.1
+++ openpkg-src/easysoap/easysoap.patch 20 Jan 2003 18:20:57 -0000 1.2
@@ -76,4 +76,119 @@
+ return XML_ErrorString(XML_GetErrorCode((XML_ParserStruct*)m_parser));
return 0;
}
+
+diff -Naur EasySoap++-0.6.1.orig/include/easysoap/SOAPDispatchHandler.h
EasySoap++-0.6.1/include/easysoap/SOAPDispatchHandler.h
+--- EasySoap++-0.6.1.orig/include/easysoap/SOAPDispatchHandler.h Mon Jan 20
19:03:22 2003
++++ EasySoap++-0.6.1/include/easysoap/SOAPDispatchHandler.h Mon Jan 20 18:59:32
2003
+@@ -61,7 +61,7 @@
+ bool ExecuteMethod(const SOAPEnvelope& request, SOAPMethod& response)
+ {
+ const SOAPMethod& method = request.GetBody().GetMethod();
+- DispatchMap::Iterator i = m_dispatchMap.Find(method.GetName());
++ typename DispatchMap::Iterator i =
m_dispatchMap.Find(method.GetName());
+ if (i)
+ {
+ T *target= GetTarget(request);
+@@ -109,7 +109,7 @@
+
+ bool HandleHeader(const SOAPParameter& header, SOAPEnvelope& request,
SOAPEnvelope& response)
+ {
+- DispatchMap::Iterator i = m_dispatchMap.Find(header.GetName());
++ typename DispatchMap::Iterator i =
m_dispatchMap.Find(header.GetName());
+
+ if (i)
+ {
+diff -Naur EasySoap++-0.6.1.orig/include/easysoap/SOAPHashMap.h
EasySoap++-0.6.1/include/easysoap/SOAPHashMap.h
+--- EasySoap++-0.6.1.orig/include/easysoap/SOAPHashMap.h Mon Jan 20 19:03:37
2003
++++ EasySoap++-0.6.1/include/easysoap/SOAPHashMap.h Mon Jan 20 18:58:30 2003
+@@ -117,13 +117,13 @@
+ {
+ private:
+ const SOAPHashMap *m_map;
+- Elements::Iterator m_index;
++ typename Elements::Iterator m_index;
+ HashElement *m_he;
+
+ friend class SOAPHashMap<K,I,H,E>;
+
+ // private constuctor that can only be called by SOAPHashMap
+- ForwardHashMapIterator(const SOAPHashMap *map, Elements::Iterator
index)
++ ForwardHashMapIterator(const SOAPHashMap *map, typename
Elements::Iterator index)
+ : m_map(map), m_index(index), m_he(0)
+ {
+ if (m_map)
+@@ -134,7 +134,7 @@
+ }
+ }
+
+- ForwardHashMapIterator(const SOAPHashMap *map, Elements::Iterator
index, HashElement *he)
++ ForwardHashMapIterator(const SOAPHashMap *map, typename
Elements::Iterator index, HashElement *he)
+ : m_map(map), m_index(index), m_he(he)
+ {
+ }
+@@ -366,8 +366,8 @@
+ {
+ Clear();
+ Resize(r.GetNumBuckets());
+- SOAPHashMap<A,B,C,D>::Iterator e = r.End();
+- for (SOAPHashMap<A,B,C,D>::Iterator it = r.Begin(); it != e;
++it)
++ typename SOAPHashMap<A,B,C,D>::Iterator e = r.End();
++ for (typename SOAPHashMap<A,B,C,D>::Iterator it = r.Begin();
it != e; ++it)
+ Add(it.Key(), it.Item());
+ }
+ return *this;
+@@ -397,7 +397,7 @@
+ */
+ Iterator Begin() const
+ {
+- return Iterator(this, (Elements::Iterator)m_elements.Begin());
++ return Iterator(this, (typename Elements::Iterator)m_elements.Begin());
+ }
+
+ /**
+@@ -407,7 +407,7 @@
+ */
+ Iterator End() const
+ {
+- return Iterator(this, (Elements::Iterator)m_elements.End());
++ return Iterator(this, (typename Elements::Iterator)m_elements.End());
+ }
+
+
+@@ -491,7 +491,7 @@
+ */
+ void Clear()
+ {
+- for (Elements::Iterator i = m_elements.Begin(); i != m_elements.End();
++i)
++ for (typename Elements::Iterator i = m_elements.Begin(); i !=
m_elements.End(); ++i)
+ {
+ HashElement *he = *i;
+ while (he)
+@@ -512,7 +512,7 @@
+ */
+ void Empty()
+ {
+- Elements::Iterator i;
++ typename Elements::Iterator i;
+ for (i = m_elements.Begin(); i != m_elements.End(); ++i)
+ {
+ HashElement *he = *i;
+@@ -588,7 +588,7 @@
+ while (he)
+ {
+ if (he->m_hash == hash && equals(he->m_key, key))
+- return Iterator(this,
(Elements::Iterator)m_elements.Begin() + index, he);
++ return Iterator(this, (typename
Elements::Iterator)m_elements.Begin() + index, he);
+ he = he->m_next;
+ }
+ }
+@@ -603,7 +603,7 @@
+
+ Elements newelements;
+ newelements.Resize(newsize);
+- Elements::Iterator i;
++ typename Elements::Iterator i;
+
+ for (i = newelements.Begin(); i != newelements.End(); ++i)
+ *i = 0;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/easysoap/easysoap.spec
============================================================================
$ cvs diff -u -r1.8 -r1.9 easysoap.spec
--- openpkg-src/easysoap/easysoap.spec 14 Jan 2003 10:29:35 -0000 1.8
+++ openpkg-src/easysoap/easysoap.spec 20 Jan 2003 18:20:57 -0000 1.9
@@ -33,7 +33,7 @@
Group: Network
License: LGPL
Version: 0.6.1
-Release: 20030114
+Release: 20030120
# list of sources
Source0: http://download.sourceforge.net/easysoap/EasySoap++-%{version}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
