From 63cd4a6f47c47ffc6d350a14535f07fa5ffbccc8 Mon Sep 17 00:00:00 2001
From: Edward Brown <edward.brown@stfc.ac.uk>
Date: Wed, 14 Mar 2018 14:04:49 +0000
Subject: [PATCH] Re #22048: Applied fixes to Framework/ICat.
---
.../inc/MantidICat/GSoap/soapserializersStub.h | 4 ++--
Framework/ICat/inc/MantidICat/GSoap/stdsoap2.h | 15 +++++++--------
.../MantidICat/ICat3/GSoapGenerated/ICat3Stub.h | 4 ++--
.../MantidICat/ICat4/GSoapGenerated/ICat4Stub.h | 4 ++--
4 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/Framework/ICat/inc/MantidICat/GSoap/soapserializersStub.h b/Framework/ICat/inc/MantidICat/GSoap/soapserializersStub.h
index 9041bbe85cc..3e7c7bb57d7 100644
--- a/Framework/ICat/inc/MantidICat/GSoap/soapserializersStub.h
+++ b/Framework/ICat/inc/MantidICat/GSoap/soapserializersStub.h
@@ -146,12 +146,12 @@ public:
#ifndef SOAP_TYPE__QName
#define SOAP_TYPE__QName (5)
-typedef char *_QName;
+using _QName = char *;
#endif
#ifndef SOAP_TYPE__XML
#define SOAP_TYPE__XML (6)
-typedef char *_XML;
+using _XML = char *;
#endif
/******************************************************************************\
diff --git a/Framework/ICat/inc/MantidICat/GSoap/stdsoap2.h b/Framework/ICat/inc/MantidICat/GSoap/stdsoap2.h
index 7a37356b858..64e7e0721ac 100644
--- a/Framework/ICat/inc/MantidICat/GSoap/stdsoap2.h
+++ b/Framework/ICat/inc/MantidICat/GSoap/stdsoap2.h
@@ -1254,7 +1254,7 @@ extern const char soap_base64o[], soap_base64i[];
/* gSOAP status/error codes */
-typedef soap_int32 soap_status;
+using soap_status = int32_t;
#define SOAP_EOF EOF
#define SOAP_ERR EOF
@@ -1364,7 +1364,7 @@ typedef soap_int32 soap_status;
/* gSOAP transport, connection, and content encoding modes */
-typedef soap_int32 soap_mode;
+using soap_mode = int32_t;
#define SOAP_IO 0x00000003 /* IO mask */
#define SOAP_IO_FLUSH 0x00000000 /* flush output immediately, no buffering */
@@ -1621,7 +1621,7 @@ typedef soap_int32 soap_mode;
/* UCS-4 requires 32 bits (0-7FFFFFFF, the sign bit is used by gSOAP to
* distinguish XML entities) */
-typedef soap_int32 soap_wchar;
+using soap_wchar = int32_t;
/* namespace table row */
struct Namespace {
@@ -1822,7 +1822,7 @@ struct soap_multipart {
const char *location; /* MIME Content-Location (optional) */
const char *description; /* MIME Content-Description (optional) */
#ifdef __cplusplus
- typedef soap_multipart_iterator iterator;
+ using iterator = soap_multipart_iterator;
#endif
};
#endif
@@ -1868,7 +1868,7 @@ struct soap_dom_attribute {
wchar_t *wide;
struct soap *soap;
#ifdef __cplusplus
- typedef soap_dom_attribute_iterator iterator;
+ using iterator = soap_dom_attribute_iterator;
struct soap_dom_attribute &set(const char *nstr,
const char *name); /* set namespace and name */
struct soap_dom_attribute &set(const char *data); /* set data */
@@ -1920,7 +1920,7 @@ struct soap_dom_element {
char *tail; /* leading content before end tag */
struct soap *soap; /* soap context that manages this node */
#ifdef __cplusplus
- typedef soap_dom_element_iterator iterator;
+ using iterator = soap_dom_element_iterator;
struct soap_dom_element &set(const char *nstr, const char *name);
struct soap_dom_element &set(const char *data);
struct soap_dom_element &set(void *node, int type);
@@ -2430,8 +2430,7 @@ SOAP_FMAC1 int SOAP_FMAC2 soap_rand(void);
#endif
/* soap_traverse() traversal/walker routines take walker function arguments */
-typedef void soap_walker(struct soap *, void *, int, const char *,
- const char *);
+using soap_walker = void (struct soap *, void *, int, const char *, const char *);
SOAP_FMAC5 int SOAP_FMAC6 soap_serve(struct soap *soap);
SOAP_FMAC5 int SOAP_FMAC6 soap_serve_request(struct soap *soap);
diff --git a/Framework/ICat/inc/MantidICat/ICat3/GSoapGenerated/ICat3Stub.h b/Framework/ICat/inc/MantidICat/ICat3/GSoapGenerated/ICat3Stub.h
index 63eb0cc97f5..55b4342d456 100644
--- a/Framework/ICat/inc/MantidICat/ICat3/GSoapGenerated/ICat3Stub.h
+++ b/Framework/ICat/inc/MantidICat/ICat3/GSoapGenerated/ICat3Stub.h
@@ -11887,12 +11887,12 @@ public:
#ifndef SOAP_TYPE_ICat3__QName
#define SOAP_TYPE_ICat3__QName (5)
-typedef char *_QName;
+using _QName = char *;
#endif
#ifndef SOAP_TYPE_ICat3__XML
#define SOAP_TYPE_ICat3__XML (6)
-typedef char *_XML;
+using _XML = char *;
#endif
/******************************************************************************\
diff --git a/Framework/ICat/inc/MantidICat/ICat4/GSoapGenerated/ICat4Stub.h b/Framework/ICat/inc/MantidICat/ICat4/GSoapGenerated/ICat4Stub.h
index d033a682838..8c998ddb6bd 100644
--- a/Framework/ICat/inc/MantidICat/ICat4/GSoapGenerated/ICat4Stub.h
+++ b/Framework/ICat/inc/MantidICat/ICat4/GSoapGenerated/ICat4Stub.h
@@ -3265,12 +3265,12 @@ public:
#ifndef SOAP_TYPE_ICat4__QName
#define SOAP_TYPE_ICat4__QName (5)
-typedef char *_QName;
+using _QName = char *;
#endif
#ifndef SOAP_TYPE_ICat4__XML
#define SOAP_TYPE_ICat4__XML (6)
-typedef char *_XML;
+using _XML = char *;
#endif
/******************************************************************************\
--
GitLab