From b0bc9610a01cbfc79fe38ebff8b4ca59235d441d Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Sat, 14 Mar 2009 17:15:26 +0000 Subject: CWS-TOOLING: integrate CWS cmcfixes55 2009-03-03 10:04:14 +0100 cmc r268711 : #i99765# silence warning 2009-03-02 12:18:48 +0100 cmc r268647 : #i99772# silence warnings under >= python 2.6 and gcc 4.4 2009-03-02 10:51:12 +0100 cmc r268641 : #i99767# fix up trivial && || 2009-03-02 10:32:02 +0100 cmc r268640 : #i99766 remove && || warning 2009-03-02 10:01:05 +0100 cmc r268638 : #i99764# easy && || warnings 2009-02-27 13:03:08 +0100 cmc r268583 : #i96059# fix dodgy code 2009-02-27 12:57:38 +0100 cmc r268582 : #i99718# don't leave unused methods on non-win platform --- pyuno/source/module/pyuno.cxx | 3 +++ pyuno/source/module/pyuno_callable.cxx | 3 +++ pyuno/source/module/pyuno_runtime.cxx | 3 +++ 3 files changed, 9 insertions(+) (limited to 'pyuno') diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx index ddec283f0d52..d1cf112fda91 100644 --- a/pyuno/source/module/pyuno.cxx +++ b/pyuno/source/module/pyuno.cxx @@ -693,6 +693,9 @@ static PyTypeObject PyUNOType = NULL, NULL, (destructor)0 +#if PY_VERSION_HEX >= 0x02060000 + , 0 +#endif }; PyRef getPyUnoClass( const Runtime &) diff --git a/pyuno/source/module/pyuno_callable.cxx b/pyuno/source/module/pyuno_callable.cxx index b7d2b595e1d2..bb558bf64411 100644 --- a/pyuno/source/module/pyuno_callable.cxx +++ b/pyuno/source/module/pyuno_callable.cxx @@ -245,6 +245,9 @@ static PyTypeObject PyUNO_callable_Type = NULL, NULL, (destructor)0 +#if PY_VERSION_HEX >= 0x02060000 + , 0 +#endif }; PyRef PyUNO_callable_new ( diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index fd5cf2030868..3a93cb91eaf7 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -119,6 +119,9 @@ static PyTypeObject RuntimeImpl_Type = NULL, NULL, (destructor)0 +#if PY_VERSION_HEX >= 0x02060000 + , 0 +#endif }; /*---------------------------------------------------------------------- -- cgit v1.2.3