summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-02-09 21:54:50 +0100
committerStephan Bergmann <sbergman@redhat.com>2020-02-10 08:03:05 +0100
commit2cfa5fbc3e15060c0eb462df25219c96f8aa5935 (patch)
treea090bfb25bd1297c29d892e21893aed99d823b2e
parenta2a8ad842fccbf214e2e25414fc715246408aa27 (diff)
-Werror,-Wnon-c-typedef-for-linkage
...with recent Clant trunk, see <https://github.com/llvm/llvm-project/commit/ 7ae1b4a0ce9c7f269cf3069e41496a78e3f28d49> " Implement P1766R1: diagnose giving non-C-compatible classes a typedef name for linkage purposes." Change-Id: Ida0bbe8f4be7845b8663ea3c86e1faf1db7f55a5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88349 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--connectivity/source/cpool/ZConnectionPool.hxx8
-rw-r--r--include/connectivity/DriversConfig.hxx4
-rw-r--r--pyuno/source/module/pyuno_impl.hxx12
-rw-r--r--unoxml/source/dom/document.cxx4
4 files changed, 14 insertions, 14 deletions
diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index 2037b014f8e3..b05c7d1ff275 100644
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
@@ -61,11 +61,11 @@ namespace connectivity
typedef std::vector< css::uno::Reference< css::sdbc::XPooledConnection> > TPooledConnections;
// contains the currently pooled connections
- typedef struct
+ struct TConnectionPool
{
TPooledConnections aConnections;
sal_Int32 nALiveCount; // will be decremented every time a time says to, when will reach zero the pool will be deleted
- } TConnectionPool;
+ };
struct TDigestHolder
{
@@ -93,11 +93,11 @@ namespace connectivity
typedef std::map< TDigestHolder,TConnectionPool,TDigestLess> TConnectionMap;
// contains additional information about an activeconnection which is needed to put it back to the pool
- typedef struct
+ struct TActiveConnectionInfo
{
TConnectionMap::iterator aPos;
css::uno::Reference< css::sdbc::XPooledConnection> xPooledConnection;
- } TActiveConnectionInfo;
+ };
typedef std::map< css::uno::Reference< css::sdbc::XConnection>,
TActiveConnectionInfo> TActiveConnectionMap;
diff --git a/include/connectivity/DriversConfig.hxx b/include/connectivity/DriversConfig.hxx
index a415f42cb665..f64a5a63882c 100644
--- a/include/connectivity/DriversConfig.hxx
+++ b/include/connectivity/DriversConfig.hxx
@@ -31,14 +31,14 @@
namespace connectivity
{
- typedef struct
+ struct TInstalledDriver
{
::comphelper::NamedValueCollection aProperties;
::comphelper::NamedValueCollection aFeatures;
::comphelper::NamedValueCollection aMetaData;
OUString sDriverFactory;
OUString sDriverTypeDisplayName;
- } TInstalledDriver;
+ };
typedef std::map<OUString, TInstalledDriver> TInstalledDrivers;
class DriversConfigImpl
diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx
index 91c24b4e7a88..8af2da85639d 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -212,11 +212,11 @@ PyRef PyUNOStruct_new (
const css::uno::Any &targetInterface,
const css::uno::Reference<css::lang::XSingleServiceFactory> &ssf );
-typedef struct
+struct PyUNOInternals
{
css::uno::Reference <css::script::XInvocation2> xInvocation;
css::uno::Any wrappedObject;
-} PyUNOInternals;
+};
typedef struct
{
@@ -227,10 +227,10 @@ typedef struct
PyObject* PyUNO_iterator_new (
const css::uno::Reference<css::container::XEnumeration>& xEnumeration);
-typedef struct
+struct PyUNO_iterator_Internals
{
css::uno::Reference <css::container::XEnumeration> xEnumeration;
-} PyUNO_iterator_Internals;
+};
typedef struct
{
@@ -241,11 +241,11 @@ typedef struct
PyObject* PyUNO_list_iterator_new (
const css::uno::Reference<css::container::XIndexAccess> &xIndexAccess);
-typedef struct
+struct PyUNO_list_iterator_Internals
{
css::uno::Reference <css::container::XIndexAccess> xIndexAccess;
int index;
-} PyUNO_list_iterator_Internals;
+};
typedef struct
{
diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx
index be96f69c9035..fe6994df2191 100644
--- a/unoxml/source/dom/document.cxx
+++ b/unoxml/source/dom/document.cxx
@@ -326,10 +326,10 @@ namespace DOM
namespace {
// IO context functions for libxml2 interaction
- typedef struct {
+ struct IOContext {
Reference< XOutputStream > stream;
bool const allowClose;
- } IOContext;
+ };
}