Compiz

Merge lp:~compiz-team/compiz/compiz.fix_1131864 into lp:compiz/0.9.9

  1. compiz.fix_1131864
  2. Merge into 0.9.9
Proposed by Sam Spilsbury
Status: Superseded
Proposed branch: lp:~compiz-team/compiz/compiz.fix_1131864
Merge into: lp:compiz/0.9.9
Diff against target: 238 lines (+33/-30)
7 files modified
compizconfig/tests/compizconfig_backend_concept_test.h (+1/-1)
gtk/window-decorator/tests/test_gwd_settings.cpp (+2/-2)
plugins/composite/src/pixmapbinding/tests/test-composite-pixmapbinding.cpp (+7/-7)
plugins/decor/src/decor.cpp (+3/-3)
plugins/decor/src/pixmap-requests/tests/test-decor-pixmap-requests.cpp (+1/-1)
src/string/tests/printf/src/test-string-printf.cpp (+8/-8)
src/window.cpp (+11/-8)
To merge this branch: bzr merge lp:~compiz-team/compiz/compiz.fix_1131864
Reviewer Review Type Date Requested Status
MC Return Needs Fixing
Compiz Maintainers Pending
Review via email: mp+155178@code.launchpad.net

This proposal supersedes a proposal from 2013-03-06.

This proposal has been superseded by a proposal from 2013-03-26.

Commit message

Remove lots of superfluous boost::shared_static_cast usage, we only need it for the downcast situation (which in itself is a little silly).

Replace the remaining usage of boost::shared_static_cast with boost::static_pointer_cast.

(LP: #1131864)

Description of the change

Remove lots of superfluous boost::shared_static_cast usage, we only need it for the downcast situation (which in itself is a little silly)

Replace the remaining usage of boost::shared_static_cast with boost::static_pointer_cast.

(LP: #1131864)

To post a comment you must log in.
Revision history for this message
MC Return (mc-return) wrote : Posted in a previous version of this proposal

This MP still throws some errors with Boost 1.53:

/home/mcr2010/src/bzr/compiz.fix_1131864/src/window.cpp: In function ‘bool isPendingRestack(const Ptr&)’:
/home/mcr2010/src/bzr/compiz.fix_1131864/src/window.cpp:3027:2: error: ‘shared_static_cast’ is not a member of ‘boost’
  boost::shared_static_cast <compiz::X11::PendingConfigureEvent> (p);
  ^
/home/mcr2010/src/bzr/compiz.fix_1131864/src/window.cpp:3027:63: error: expected primary-expression before ‘>’ token
  boost::shared_static_cast <compiz::X11::PendingConfigureEvent> (p);
                                                               ^
/home/mcr2010/src/bzr/compiz.fix_1131864/src/window.cpp: In function ‘bool isExistingRequest(const Ptr&, XWindowChanges&, unsigned int)’:
/home/mcr2010/src/bzr/compiz.fix_1131864/src/window.cpp:3037:6: error: ‘shared_static_cast’ is not a member of ‘boost’
      boost::shared_static_cast <compiz::X11::PendingConfigureEvent> (p);
      ^
/home/mcr2010/src/bzr/compiz.fix_1131864/src/window.cpp:3037:67: error: expected primary-expression before ‘>’ token
      boost::shared_static_cast <compiz::X11::PendingConfigureEvent> (p);
                                                                   ^
At global scope:
cc1plus: warning: unrecognized command line option "-Wno-unused-private-field" [enabled by default]
cc1plus: warning: unrecognized command line option "-Wno-unused-private-field" [enabled by default]
cc1plus: warning: unrecognized command line option "-Wno-unused-private-field" [enabled by default]
[ 39%] make[2]: *** [src/CMakeFiles/compiz_core.dir/window.cpp.o] Error 1
make[2]: *** Waiting for unfinished jobs....

review: Needs Fixing
Revision history for this message
Sam Spilsbury (smspillaz) wrote : Posted in a previous version of this proposal

> This MP still throws some errors with Boost 1.53:
>
> /home/mcr2010/src/bzr/compiz.fix_1131864/src/window.cpp: In function ‘bool
> isPendingRestack(const Ptr&)’:
> /home/mcr2010/src/bzr/compiz.fix_1131864/src/window.cpp:3027:2: error:
> ‘shared_static_cast’ is not a member of ‘boost’
> boost::shared_static_cast <compiz::X11::PendingConfigureEvent> (p);
> ^
> /home/mcr2010/src/bzr/compiz.fix_1131864/src/window.cpp:3027:63: error:
> expected primary-expression before ‘>’ token
> boost::shared_static_cast <compiz::X11::PendingConfigureEvent> (p);
> ^
> /home/mcr2010/src/bzr/compiz.fix_1131864/src/window.cpp: In function ‘bool
> isExistingRequest(const Ptr&, XWindowChanges&, unsigned int)’:
> /home/mcr2010/src/bzr/compiz.fix_1131864/src/window.cpp:3037:6: error:
> ‘shared_static_cast’ is not a member of ‘boost’
> boost::shared_static_cast <compiz::X11::PendingConfigureEvent> (p);
> ^
> /home/mcr2010/src/bzr/compiz.fix_1131864/src/window.cpp:3037:67: error:
> expected primary-expression before ‘>’ token
> boost::shared_static_cast <compiz::X11::PendingConfigureEvent> (p);
> ^
> At global scope:
> cc1plus: warning: unrecognized command line option "-Wno-unused-private-field"
> [enabled by default]
> cc1plus: warning: unrecognized command line option "-Wno-unused-private-field"
> [enabled by default]
> cc1plus: warning: unrecognized command line option "-Wno-unused-private-field"
> [enabled by default]
> [ 39%] make[2]: *** [src/CMakeFiles/compiz_core.dir/window.cpp.o] Error 1
> make[2]: *** Waiting for unfinished jobs....

Ah, thanks for that. Looks as though they are completely removed, I thought maybe the header file just changed.

https://bitbucket.org/osrf/gazebo/issue/581/boost-shared_-_cast-are-deprecated-removed

I've done a quick s/shared_static_cast/static_pointer_cast/

Revision history for this message
MC Return (mc-return) wrote :
Download full text (6.7 KiB)

Getting much further now, but some Boost troubles unfortunately remain:

[ 75%] Building CXX object plugins/ezoom/CMakeFiles/ezoom.dir/src/ezoom.cpp.o
/home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp: In constructor ‘DecorScreen::DecorScreen(CompScreen*)’:
/home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:3049:48: error: no matching function for call to ‘boost::shared_array<_decor_quad>::shared_array(NULL)’
        boost::shared_array <decor_quad_t> (NULL),
                                                ^
/home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:3049:48: note: candidates are:
In file included from /usr/include/boost/shared_array.hpp:17:0,
                 from /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.h:27,
                 from /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:38:
/usr/include/boost/smart_ptr/shared_array.hpp:126:5: note: template<class Y> boost::shared_array<T>::shared_array(const boost::shared_array<Y>&, boost::shared_array<T>::element_type*)
     shared_array( shared_array<Y> const & r, element_type * p ) BOOST_NOEXCEPT : px( p ), pn( r.pn )
     ^
/usr/include/boost/smart_ptr/shared_array.hpp:126:5: note: template argument deduction/substitution failed:
/home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:3049:48: note: mismatched types ‘const boost::shared_array<T>’ and ‘long int’
        boost::shared_array <decor_quad_t> (NULL),
                                                ^
In file included from /usr/include/boost/shared_array.hpp:17:0,
                 from /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.h:27,
                 from /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:38:
/usr/include/boost/smart_ptr/shared_array.hpp:111:5: note: template<class Y> boost::shared_array<T>::shared_array(const boost::shared_array<Y>&, typename boost::detail::sp_enable_if_convertible<Y [], T []>::type)
     shared_array( shared_array<Y> const & r, typename boost::detail::sp_enable_if_convertible< Y[], T[] >::type = boost::detail::sp_empty() )
     ^
/usr/include/boost/smart_ptr/shared_array.hpp:111:5: note: template argument deduction/substitution failed:
/home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:3049:48: note: mismatched types ‘const boost::shared_array<T>’ and ‘long int’
        boost::shared_array <decor_quad_t> (NULL),
                                                ^
In file included from /usr/include/boost/shared_array.hpp:17:0,
                 from /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.h:27,
                 from /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:38:
/usr/include/boost/smart_ptr/shared_array.hpp:83:41: note: template<class Y, class D, class A> boost::shared_array<T>::shared_array(Y*, D, A)
     template<class Y, class D, class A> shared_array( Y * p, D d, A a ): px( p ), pn( p, d, a )
                                         ^
/usr/include/boost/smart_ptr/shared_array.hpp:83:41: note: template argument deduction/substitution failed:
/home/mcr2010/src/bzr/com...

Read more...

review: Needs Fixing
Revision history for this message
Sam Spilsbury (smspillaz) wrote :
Download full text (7.3 KiB)

Ah, shared_array is gone too?

I'll try installing boost 1.53 later today then and see what else
needs to be fixed.

On Mon, Mar 25, 2013 at 5:17 PM, MC Return <email address hidden> wrote:
> Review: Needs Fixing
>
> Getting much further now, but some Boost troubles unfortunately remain:
>
> [ 75%] Building CXX object plugins/ezoom/CMakeFiles/ezoom.dir/src/ezoom.cpp.o
> /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp: In constructor ‘DecorScreen::DecorScreen(CompScreen*)’:
> /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:3049:48: error: no matching function for call to ‘boost::shared_array<_decor_quad>::shared_array(NULL)’
> boost::shared_array <decor_quad_t> (NULL),
> ^
> /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:3049:48: note: candidates are:
> In file included from /usr/include/boost/shared_array.hpp:17:0,
> from /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.h:27,
> from /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:38:
> /usr/include/boost/smart_ptr/shared_array.hpp:126:5: note: template<class Y> boost::shared_array<T>::shared_array(const boost::shared_array<Y>&, boost::shared_array<T>::element_type*)
> shared_array( shared_array<Y> const & r, element_type * p ) BOOST_NOEXCEPT : px( p ), pn( r.pn )
> ^
> /usr/include/boost/smart_ptr/shared_array.hpp:126:5: note: template argument deduction/substitution failed:
> /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:3049:48: note: mismatched types ‘const boost::shared_array<T>’ and ‘long int’
> boost::shared_array <decor_quad_t> (NULL),
> ^
> In file included from /usr/include/boost/shared_array.hpp:17:0,
> from /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.h:27,
> from /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:38:
> /usr/include/boost/smart_ptr/shared_array.hpp:111:5: note: template<class Y> boost::shared_array<T>::shared_array(const boost::shared_array<Y>&, typename boost::detail::sp_enable_if_convertible<Y [], T []>::type)
> shared_array( shared_array<Y> const & r, typename boost::detail::sp_enable_if_convertible< Y[], T[] >::type = boost::detail::sp_empty() )
> ^
> /usr/include/boost/smart_ptr/shared_array.hpp:111:5: note: template argument deduction/substitution failed:
> /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:3049:48: note: mismatched types ‘const boost::shared_array<T>’ and ‘long int’
> boost::shared_array <decor_quad_t> (NULL),
> ^
> In file included from /usr/include/boost/shared_array.hpp:17:0,
> from /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.h:27,
> from /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:38:
> /usr/include/boost/smart_ptr/shared_array.hpp:83:41: note: template<class Y, class D, class A> boost::shared_array<T>::shared_array(Y*, D, A)
 ...

Read more...

Revision history for this message
Sam Spilsbury (smspillaz) wrote :
Download full text (7.5 KiB)

Actually, can you do make -k and post the logs somewhere?

On Mon, Mar 25, 2013 at 6:09 PM, Sam Spilsbury <email address hidden> wrote:
> Ah, shared_array is gone too?
>
> I'll try installing boost 1.53 later today then and see what else
> needs to be fixed.
>
> On Mon, Mar 25, 2013 at 5:17 PM, MC Return <email address hidden> wrote:
>> Review: Needs Fixing
>>
>> Getting much further now, but some Boost troubles unfortunately remain:
>>
>> [ 75%] Building CXX object plugins/ezoom/CMakeFiles/ezoom.dir/src/ezoom.cpp.o
>> /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp: In constructor ‘DecorScreen::DecorScreen(CompScreen*)’:
>> /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:3049:48: error: no matching function for call to ‘boost::shared_array<_decor_quad>::shared_array(NULL)’
>> boost::shared_array <decor_quad_t> (NULL),
>> ^
>> /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:3049:48: note: candidates are:
>> In file included from /usr/include/boost/shared_array.hpp:17:0,
>> from /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.h:27,
>> from /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:38:
>> /usr/include/boost/smart_ptr/shared_array.hpp:126:5: note: template<class Y> boost::shared_array<T>::shared_array(const boost::shared_array<Y>&, boost::shared_array<T>::element_type*)
>> shared_array( shared_array<Y> const & r, element_type * p ) BOOST_NOEXCEPT : px( p ), pn( r.pn )
>> ^
>> /usr/include/boost/smart_ptr/shared_array.hpp:126:5: note: template argument deduction/substitution failed:
>> /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:3049:48: note: mismatched types ‘const boost::shared_array<T>’ and ‘long int’
>> boost::shared_array <decor_quad_t> (NULL),
>> ^
>> In file included from /usr/include/boost/shared_array.hpp:17:0,
>> from /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.h:27,
>> from /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:38:
>> /usr/include/boost/smart_ptr/shared_array.hpp:111:5: note: template<class Y> boost::shared_array<T>::shared_array(const boost::shared_array<Y>&, typename boost::detail::sp_enable_if_convertible<Y [], T []>::type)
>> shared_array( shared_array<Y> const & r, typename boost::detail::sp_enable_if_convertible< Y[], T[] >::type = boost::detail::sp_empty() )
>> ^
>> /usr/include/boost/smart_ptr/shared_array.hpp:111:5: note: template argument deduction/substitution failed:
>> /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:3049:48: note: mismatched types ‘const boost::shared_array<T>’ and ‘long int’
>> boost::shared_array <decor_quad_t> (NULL),
>> ^
>> In file included from /usr/include/boost/shared_array.hpp:17:0,
>> from /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.h:27,
>> from /home/mcr2010/src/bzr/compiz.fix_113186...

Read more...

Revision history for this message
MC Return (mc-return) wrote :

> Actually, can you do make -k and post the logs somewhere?
>
Sure, one moment :)

Revision history for this message
MC Return (mc-return) wrote :
Download full text (6.7 KiB)

The only problems left seem to be:

[ 51%] Building CXX object plugins/decor/CMakeFiles/decor.dir/src/decor.cpp.o
/home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp: In constructor ‘DecorScreen::DecorScreen(CompScreen*)’:
/home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:3049:48: error: no matching function for call to ‘boost::shared_array<_decor_quad>::shared_array(NULL)’
        boost::shared_array <decor_quad_t> (NULL),
                                                ^
/home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:3049:48: note: candidates are:
In file included from /usr/include/boost/shared_array.hpp:17:0,
                 from /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.h:27,
                 from /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:38:
/usr/include/boost/smart_ptr/shared_array.hpp:126:5: note: template<class Y> boost::shared_array<T>::shared_array(const boost::shared_array<Y>&, boost::shared_array<T>::element_type*)
     shared_array( shared_array<Y> const & r, element_type * p ) BOOST_NOEXCEPT : px( p ), pn( r.pn )
     ^
/usr/include/boost/smart_ptr/shared_array.hpp:126:5: note: template argument deduction/substitution failed:
/home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:3049:48: note: mismatched types ‘const boost::shared_array<T>’ and ‘long int’
        boost::shared_array <decor_quad_t> (NULL),
                                                ^
In file included from /usr/include/boost/shared_array.hpp:17:0,
                 from /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.h:27,
                 from /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:38:
/usr/include/boost/smart_ptr/shared_array.hpp:111:5: note: template<class Y> boost::shared_array<T>::shared_array(const boost::shared_array<Y>&, typename boost::detail::sp_enable_if_convertible<Y [], T []>::type)
     shared_array( shared_array<Y> const & r, typename boost::detail::sp_enable_if_convertible< Y[], T[] >::type = boost::detail::sp_empty() )
     ^
/usr/include/boost/smart_ptr/shared_array.hpp:111:5: note: template argument deduction/substitution failed:
/home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:3049:48: note: mismatched types ‘const boost::shared_array<T>’ and ‘long int’
        boost::shared_array <decor_quad_t> (NULL),
                                                ^
In file included from /usr/include/boost/shared_array.hpp:17:0,
                 from /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.h:27,
                 from /home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/decor.cpp:38:
/usr/include/boost/smart_ptr/shared_array.hpp:83:41: note: template<class Y, class D, class A> boost::shared_array<T>::shared_array(Y*, D, A)
     template<class Y, class D, class A> shared_array( Y * p, D d, A a ): px( p ), pn( p, d, a )
                                         ^
/usr/include/boost/smart_ptr/shared_array.hpp:83:41: note: template argument deduction/substitution failed:
/home/mcr2010/src/bzr/compiz.fix_1131864/plugins/decor/src/dec...

Read more...

Revision history for this message
MC Return (mc-return) wrote :

Note that BUILD_GLES, BUILD_XORG_GTEST, BUILD_TESTING and COMPIZ_BUILD_TESTING are disabled here ^^

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Sure, I don't think that would have any effect.

Thanks for doing that, I'll get on to it as soon as I get home later today.

On Mon, Mar 25, 2013 at 6:38 PM, MC Return <email address hidden> wrote:
> Note that BUILD_GLES, BUILD_XORG_GTEST, BUILD_TESTING and COMPIZ_BUILD_TESTING are disabled here ^^
> --
> https://code.launchpad.net/~compiz-team/compiz/compiz.fix_1131864/+merge/155178
> Your team Compiz Maintainers is requested to review the proposed merge of lp:~compiz-team/compiz/compiz.fix_1131864 into lp:compiz.

--
Sam Spilsbury

Revision history for this message
MC Return (mc-return) wrote :

> Sure, I don't think that would have any effect.
>
Well, I just wanted to inform you about it, because the test code also uses Boost.

> Thanks for doing that, I'll get on to it as soon as I get home later today.
>
No problem, thanks a lot for fixing it.

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

On 25/03/2013 7:01 PM, "MC Return" <email address hidden> wrote:
>
> > Sure, I don't think that would have any effect.
> >
> Well, I just wanted to inform you about it, because the test code also
 uses Boost.

Ah, correct.
>
> > Thanks for doing that, I'll get on to it as soon as I get home later
 today.
> >
> No problem, thanks a lot for fixing it.
> --
>
 https://code.launchpad.net/~compiz-team/compiz/compiz.fix_1131864/+merge/155178
> Your team Compiz Maintainers is requested to review the proposed merge of
 lp:~compiz-team/compiz/compiz.fix_1131864 into lp:compiz.

lp:~compiz-team/compiz/compiz.fix_1131864 updated
3633. By Sam Spilsbury

Cast to the correct type

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'compizconfig/tests/compizconfig_backend_concept_test.h'
2--- compizconfig/tests/compizconfig_backend_concept_test.h 2012-10-06 16:22:09 +0000
3+++ compizconfig/tests/compizconfig_backend_concept_test.h 2013-03-25 14:31:22 +0000
4@@ -90,7 +90,7 @@
5 CCSBackendConceptTestEnvironmentInterface::Ptr
6 ConstructTestEnv ()
7 {
8- return boost::shared_static_cast <I> (boost::make_shared <I> ());
9+ return boost::make_shared <I> ();
10 }
11 };
12
13
14=== modified file 'gtk/window-decorator/tests/test_gwd_settings.cpp'
15--- gtk/window-decorator/tests/test_gwd_settings.cpp 2012-10-03 10:50:07 +0000
16+++ gtk/window-decorator/tests/test_gwd_settings.cpp 2013-03-25 14:31:22 +0000
17@@ -1473,7 +1473,7 @@
18 };
19
20 INSTANTIATE_TEST_CASE_P (MockStorageUpdates, GWDSettingsTestStorageUpdates,
21- ::testing::Values (boost::shared_static_cast <GWDSettingsStorageFactoryWrapperInterface> (boost::make_shared <GWDMockSettingsStorageFactoryWrapper> ())));
22+ ::testing::Values (boost::shared_ptr <GWDSettingsStorageFactoryWrapperInterface> (new GWDMockSettingsStorageFactoryWrapper ())));
23
24 #ifdef USE_GSETTINGS
25 class GWDSettingsStorageGSettingsTest :
26@@ -1625,6 +1625,6 @@
27 };
28
29 INSTANTIATE_TEST_CASE_P (GSettingsStorageUpdates, GWDSettingsTestStorageUpdates,
30- ::testing::Values (boost::shared_static_cast <GWDSettingsStorageFactoryWrapperInterface> (boost::make_shared <GWDSettingsStorageGSettingsFactoryWrapper> ())));
31+ ::testing::Values (boost::shared_ptr <GWDSettingsStorageFactoryWrapperInterface> (new GWDSettingsStorageGSettingsFactoryWrapper ())));
32
33 #endif
34
35=== modified file 'plugins/composite/src/pixmapbinding/tests/test-composite-pixmapbinding.cpp'
36--- plugins/composite/src/pixmapbinding/tests/test-composite-pixmapbinding.cpp 2012-06-22 04:38:21 +0000
37+++ plugins/composite/src/pixmapbinding/tests/test-composite-pixmapbinding.cpp 2013-03-25 14:31:22 +0000
38@@ -167,7 +167,7 @@
39 EXPECT_CALL (msg, grabServer ());
40 EXPECT_CALL (msg, syncServer ()).Times (2);
41 EXPECT_CALL (mwag, getAttributes (_)).WillOnce (Invoke (&fwag, &FakeWindowAttributesGet::getAttributes));
42- EXPECT_CALL (mwpg, getPixmap ()).WillOnce (Return (boost::shared_static_cast <WindowPixmapInterface> (wp)));
43+ EXPECT_CALL (mwpg, getPixmap ()).WillOnce (Return (wp));
44
45 EXPECT_CALL (*wp, pixmap ()).WillOnce (Return (1));
46
47@@ -214,7 +214,7 @@
48 EXPECT_CALL (msg, grabServer ());
49 EXPECT_CALL (msg, syncServer ()).Times (2);
50 EXPECT_CALL (mwag, getAttributes (_)).WillOnce (Invoke (&fwag, &FakeWindowAttributesGet::getAttributes));
51- EXPECT_CALL (mwpg, getPixmap ()).WillOnce (Return (boost::shared_static_cast <WindowPixmapInterface> (wp)));
52+ EXPECT_CALL (mwpg, getPixmap ()).WillOnce (Return (wp));
53
54 EXPECT_CALL (*wp, pixmap ()).WillOnce (Return (1));
55
56@@ -262,7 +262,7 @@
57 EXPECT_CALL (msg, grabServer ());
58 EXPECT_CALL (msg, syncServer ()).Times (2);
59 EXPECT_CALL (mwag, getAttributes (_)).WillOnce (Invoke (&fwag, &FakeWindowAttributesGet::getAttributes));
60- EXPECT_CALL (mwpg, getPixmap ()).WillOnce (Return (boost::shared_static_cast <WindowPixmapInterface> (wp)));
61+ EXPECT_CALL (mwpg, getPixmap ()).WillOnce (Return (wp));
62
63 EXPECT_CALL (*wp, pixmap ()).WillOnce (Return (1));
64
65@@ -284,7 +284,7 @@
66 EXPECT_CALL (msg, grabServer ());
67 EXPECT_CALL (msg, syncServer ()).Times (2);
68 EXPECT_CALL (mwag, getAttributes (_)).WillOnce (Invoke (&fwag, &FakeWindowAttributesGet::getAttributes));
69- EXPECT_CALL (mwpg, getPixmap ()).WillOnce (Return (boost::shared_static_cast <WindowPixmapInterface> (wp)));
70+ EXPECT_CALL (mwpg, getPixmap ()).WillOnce (Return (wp));
71
72 EXPECT_CALL (*wp, pixmap ()).WillOnce (Return (1));
73
74@@ -331,7 +331,7 @@
75 EXPECT_CALL (msg, grabServer ());
76 EXPECT_CALL (msg, syncServer ()).Times (2);
77 EXPECT_CALL (mwag, getAttributes (_)).WillOnce (Invoke (&fwag, &FakeWindowAttributesGet::getAttributes));
78- EXPECT_CALL (mwpg, getPixmap ()).WillOnce (Return (boost::shared_static_cast <WindowPixmapInterface> (wp)));
79+ EXPECT_CALL (mwpg, getPixmap ()).WillOnce (Return (wp));
80
81 EXPECT_CALL (*wp, pixmap ()).WillOnce (Return (1));
82
83@@ -450,7 +450,7 @@
84 EXPECT_CALL (msg, grabServer ());
85 EXPECT_CALL (msg, syncServer ()).Times (2);
86 EXPECT_CALL (mwag, getAttributes (_)).WillOnce (Invoke (&fwag, &FakeWindowAttributesGet::getAttributes));
87- EXPECT_CALL (mwpg, getPixmap ()).WillOnce (Return (boost::shared_static_cast <WindowPixmapInterface> (wp)));
88+ EXPECT_CALL (mwpg, getPixmap ()).WillOnce (Return (wp));
89
90 EXPECT_CALL (*wp, pixmap ()).WillOnce (Return (0));
91
92@@ -510,7 +510,7 @@
93 EXPECT_CALL (msg, grabServer ());
94 EXPECT_CALL (msg, syncServer ()).Times (2);
95 EXPECT_CALL (mwag, getAttributes (_)).WillOnce (Invoke (&fwag2, &FakeWindowAttributesGet::getAttributes));
96- EXPECT_CALL (mwpg, getPixmap ()).WillOnce (Return (boost::shared_static_cast <WindowPixmapInterface> (wp)));
97+ EXPECT_CALL (mwpg, getPixmap ()).WillOnce (Return (wp));
98
99 EXPECT_CALL (msg, ungrabServer ());
100
101
102=== modified file 'plugins/decor/src/decor.cpp'
103--- plugins/decor/src/decor.cpp 2013-03-22 15:52:13 +0000
104+++ plugins/decor/src/decor.cpp 2013-03-25 14:31:22 +0000
105@@ -395,7 +395,7 @@
106
107 DecorPixmap::Ptr pm = boost::make_shared <DecorPixmap> (pixmap, mReleasePool);
108
109- DecorTexture *texture = new DecorTexture (boost::shared_static_cast <DecorPixmapInterface> (pm));
110+ DecorTexture *texture = new DecorTexture (pm);
111
112 if (!texture->status)
113 {
114@@ -1297,7 +1297,7 @@
115 if (d->frameType == frameType &&
116 d->frameState == frameState &&
117 d->frameActions == frameActions)
118- return boost::shared_static_cast <DecorationInterface> (d);
119+ return d;
120 }
121
122 return DecorationInterface::Ptr ();
123@@ -3106,7 +3106,7 @@
124 0,
125 0,
126 None,
127- boost::shared_array <decor_quad_t> (NULL),
128+ boost::shared_array <decor_quad_t> (static_cast <decor_quad_t *> (NULL)),
129 0,
130 screen->root (),
131 NULL)),
132
133=== modified file 'plugins/decor/src/pixmap-requests/tests/test-decor-pixmap-requests.cpp'
134--- plugins/decor/src/pixmap-requests/tests/test-decor-pixmap-requests.cpp 2013-02-11 17:44:19 +0000
135+++ plugins/decor/src/pixmap-requests/tests/test-decor-pixmap-requests.cpp 2013-03-25 14:31:22 +0000
136@@ -45,7 +45,7 @@
137 TEST(DecorPixmapRequestsTest, TestDestroyPixmapDeletes)
138 {
139 boost::shared_ptr <MockDecorPixmapDeletor> mockDeletor = boost::make_shared <MockDecorPixmapDeletor> ();
140- DecorPixmap pm (1, boost::shared_static_cast<PixmapDestroyQueue> (mockDeletor));
141+ DecorPixmap pm (1, mockDeletor);
142
143 EXPECT_CALL (*(mockDeletor.get ()), destroyUnusedPixmap (1)).WillOnce (Return (1));
144 }
145
146=== modified file 'src/string/tests/printf/src/test-string-printf.cpp'
147--- src/string/tests/printf/src/test-string-printf.cpp 2012-01-18 16:42:49 +0000
148+++ src/string/tests/printf/src/test-string-printf.cpp 2013-03-25 14:31:22 +0000
149@@ -94,17 +94,17 @@
150 {
151 if (fmt == "%i" || fmt == "%d")
152 return compPrintf(fmt.c_str(),
153- (boost::shared_static_cast<TValue<int> >(v))->value());
154+ (boost::static_pointer_cast<TValue<int> >(v))->value());
155 if (fmt == "%f")
156 return compPrintf(fmt.c_str(),
157- (boost::shared_static_cast<TValue<float> >(v))->value());
158+ (boost::static_pointer_cast<TValue<float> >(v))->value());
159 if (fmt == "%s")
160 return compPrintf(
161 fmt.c_str(),
162- (boost::shared_static_cast<TValue<std::string> >(v))->value().c_str());
163+ (boost::static_pointer_cast<TValue<std::string> >(v))->value().c_str());
164 if (fmt == "%x")
165 return compPrintf(fmt.c_str(),
166- (boost::shared_static_cast<TValue<int> >(v))->value());
167+ (boost::static_pointer_cast<TValue<int> >(v))->value());
168
169 return "not_reached";
170 }
171@@ -142,13 +142,13 @@
172
173 ASSERT_EQ(s1, s2);
174
175- formatValues["%i"] = boost::shared_static_cast <compiz::string::printf_test::Value> (compiz::string::printf_test::Value::Ptr (new compiz::string::printf_test::TValue<int> (6)));
176+ formatValues["%i"] = compiz::string::printf_test::Value::Ptr (new compiz::string::printf_test::TValue<int> (6));
177 formatStrings["%i"] = CompString ("6");
178- formatValues["%f"] = boost::shared_static_cast <compiz::string::printf_test::Value> (compiz::string::printf_test::Value::Ptr (new compiz::string::printf_test::TValue<float> (6.532)));
179+ formatValues["%f"] = compiz::string::printf_test::Value::Ptr (new compiz::string::printf_test::TValue<float> (6.532));
180 formatStrings["%f"] = CompString ("6.532000");
181- formatValues["%x"] = boost::shared_static_cast <compiz::string::printf_test::Value> (compiz::string::printf_test::Value::Ptr (new compiz::string::printf_test::TValue<int> (0x34fe5aa)));
182+ formatValues["%x"] = compiz::string::printf_test::Value::Ptr (new compiz::string::printf_test::TValue<int> (0x34fe5aa));
183 formatStrings["%x"] = CompString ("34fe5aa");
184- formatValues["%d"] = boost::shared_static_cast <compiz::string::printf_test::Value> (compiz::string::printf_test::Value::Ptr (new compiz::string::printf_test::TValue<int> (2)));
185+ formatValues["%d"] = compiz::string::printf_test::Value::Ptr (new compiz::string::printf_test::TValue<int> (2));
186 formatStrings["%d"] = CompString ("2");
187
188 for (std::map <CompString, CompString>::iterator it = formatStrings.begin ();
189
190=== modified file 'src/window.cpp'
191--- src/window.cpp 2013-03-11 06:38:17 +0000
192+++ src/window.cpp 2013-03-25 14:31:22 +0000
193@@ -38,6 +38,7 @@
194
195 #include <boost/bind.hpp>
196 #include <boost/make_shared.hpp>
197+#include <boost/pointer_cast.hpp>
198
199 #include <core/icon.h>
200 #include <core/atoms.h>
201@@ -3021,16 +3022,20 @@
202 return m;
203 }
204
205-static bool isPendingRestack (compiz::X11::PendingEvent::Ptr p)
206+static bool isPendingRestack (const compiz::X11::PendingEvent::Ptr &p)
207 {
208- compiz::X11::PendingConfigureEvent::Ptr pc = boost::shared_static_cast <compiz::X11::PendingConfigureEvent> (p);
209+ compiz::X11::PendingConfigureEvent::Ptr pc =
210+ boost::static_pointer_cast <compiz::X11::PendingConfigureEvent> (p);
211
212 return pc->matchVM (CWStackMode | CWSibling);
213 }
214
215-static bool isExistingRequest (compiz::X11::PendingEvent::Ptr p, XWindowChanges &xwc, unsigned int valueMask)
216+static bool isExistingRequest (const compiz::X11::PendingEvent::Ptr &p,
217+ XWindowChanges &xwc,
218+ unsigned int valueMask)
219 {
220- compiz::X11::PendingConfigureEvent::Ptr pc = boost::shared_static_cast <compiz::X11::PendingConfigureEvent> (p);
221+ compiz::X11::PendingConfigureEvent::Ptr pc =
222+ boost::static_pointer_cast <compiz::X11::PendingConfigureEvent> (p);
223
224 return pc->matchRequest (xwc, valueMask);
225 }
226@@ -4161,10 +4166,8 @@
227
228 if (serverFrame)
229 {
230- compiz::X11::PendingEvent::Ptr pc =
231- boost::shared_static_cast<compiz::X11::PendingEvent> (compiz::X11::PendingConfigureEvent::Ptr (
232- new compiz::X11::PendingConfigureEvent (
233- screen->dpy (), serverFrame, valueMask, &lxwc)));
234+ compiz::X11::PendingEvent::Ptr pc (new compiz::X11::PendingConfigureEvent (
235+ screen->dpy (), serverFrame, valueMask, &lxwc));
236
237 pendingConfigures.add (pc);
238 }

Subscribers

People subscribed via source and target branches