diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-03 15:51:34 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-03 15:51:34 +0100 |
| commit | c7fed98b9ddef32b7c17d6022435b5bf8c4fa3f5 (patch) | |
| tree | 3ae3947ff14a14208f6ece4e635f0b5641c8c9d3 /dep/gsoap/soapServer.cpp | |
| parent | ffe8c75f17aa4c4059771265dd408055cb3c4e52 (diff) | |
| parent | 0db5573d4de436cf14c9f6d113a28800fa278c2c (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
dep/PackageList.txt
Diffstat (limited to 'dep/gsoap/soapServer.cpp')
| -rw-r--r-- | dep/gsoap/soapServer.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/dep/gsoap/soapServer.cpp b/dep/gsoap/soapServer.cpp index 8c8206fb3ef..b6304a3e525 100644 --- a/dep/gsoap/soapServer.cpp +++ b/dep/gsoap/soapServer.cpp @@ -1,8 +1,11 @@ /* soapServer.cpp - Generated by gSOAP 2.8.2 from stub.h - Copyright(C) 2000-2011, Robert van Engelen, Genivia Inc. All Rights Reserved. - The generated code is released under one of the following licenses: - GPL OR Genivia's license for commercial use. + Generated by gSOAP 2.8.10 from gsoap.stub + +Copyright(C) 2000-2012, Robert van Engelen, Genivia Inc. All Rights Reserved. +The generated code is released under one of the following licenses: +1) GPL or 2) Genivia's license for commercial use. +This program is released under the GPL with the additional exemption that +compiling, linking, and/or using OpenSSL is allowed. */ #if defined(__BORLANDC__) @@ -11,7 +14,7 @@ #endif #include "soapH.h" -SOAP_SOURCE_STAMP("@(#) soapServer.cpp ver 2.8.2 2011-04-26 21:49:07 GMT") +SOAP_SOURCE_STAMP("@(#) soapServer.cpp ver 2.8.10 2012-09-02 20:48:00 GMT") SOAP_FMAC5 int SOAP_FMAC6 soap_serve(struct soap *soap) @@ -67,6 +70,7 @@ SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__executeCommand(struct soap *soap) soap_tmp_string = NULL; soap_tmp_ns1__executeCommandResponse.result = &soap_tmp_string; soap_default_ns1__executeCommand(soap, &soap_tmp_ns1__executeCommand); + soap->encodingStyle = NULL; if (!soap_get_ns1__executeCommand(soap, &soap_tmp_ns1__executeCommand, "ns1:executeCommand", NULL)) return soap->error; if (soap_body_end_in(soap) |