diff options
| author | Peter Foley <pefoley2@pefoley.com> | 2016-01-15 22:30:37 -0500 |
|---|---|---|
| committer | jan iversen <jani@documentfoundation.org> | 2016-01-16 10:56:12 +0000 |
| commit | 6240b6b17682784182c0b8dbf9eb2341309d2b6f (patch) | |
| tree | f802e8c9ae9ccae22584999987ddb02b2a32e23d /sd | |
| parent | a7bdc9daa802ea67e41e0f93bdd8f0e64b00f8d9 (diff) | |
Fix ODR Violations under LTO
/home/peter/libreoffice/sd/source/ui/slideshow/slideshowimpl.hxx:162:7: warning: type ‘struct SlideshowImpl’ violates one definition rule [-Wodr]
class SlideshowImpl : private ::cppu::BaseMutex, public SlideshowImplBase
^
/home/peter/libreoffice/sd/source/ui/slideshow/slideshowimpl.hxx:162:7: note: a different type is defined in another translation unit
class SlideshowImpl : private ::cppu::BaseMutex, public SlideshowImplBase
^
/home/peter/libreoffice/sd/source/ui/slideshow/slideshowimpl.hxx:334:28: note: the first difference of corresponding definitions is field ‘mpShowWindow’
VclPtr<ShowWindow> mpShowWindow;
^
/home/peter/libreoffice/sd/source/ui/slideshow/slideshowimpl.hxx:334:28: note: a field of same name but different type is defined in another translation unit
VclPtr<ShowWindow> mpShowWindow;
^
/home/peter/libreoffice/include/vcl/vclptr.hxx:75:7: note: type name ‘VclPtr<sd::ShowWindow>’ should match type name ‘VclPtr<ShowWindow>’
class VclPtr
^
/home/peter/libreoffice/include/vcl/vclptr.hxx:75:7: note: the incompatible type is defined here
class VclPtr
^
/home/peter/libreoffice/sd/source/ui/slideshow/slideshowviewimpl.hxx:166:7: warning: type ‘struct SlideShowView’ violates one definition rule [-Wodr]
class SlideShowView : public ::comphelper::OBaseMutex,
^
/home/peter/libreoffice/sd/source/ui/slideshow/slideshowviewimpl.hxx:166:7: note: a different type is defined in another translation unit
class SlideShowView : public ::comphelper::OBaseMutex,
^
/home/peter/libreoffice/sd/source/ui/slideshow/slideshowviewimpl.hxx:232:45: note: the first difference of corresponding definitions is field ‘mpSlideShow’
SlideshowImpl* mpSlideShow;
^
/home/peter/libreoffice/sd/source/ui/slideshow/slideshowviewimpl.hxx:232:45: note: a field of same name but different type is defined in another translation unit
SlideshowImpl* mpSlideShow;
^
/home/peter/libreoffice/sd/source/ui/slideshow/slideshowimpl.hxx:162:7: note: type ‘struct SlideshowImpl’ should match type ‘struct SlideshowImpl’ that itself violate one definition rule
class SlideshowImpl : private ::cppu::BaseMutex, public SlideshowImplBase
^
/home/peter/libreoffice/sd/source/ui/slideshow/slideshowimpl.hxx:162:7: note: the incompatible type is defined here
class SlideshowImpl : private ::cppu::BaseMutex, public SlideshowImplBase
^
Change-Id: Ibbb7fb6f35f7e2771aef78a38fc4b6adef131845
Reviewed-on: https://gerrit.libreoffice.org/21503
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
Tested-by: jan iversen <jani@documentfoundation.org>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 88666d414243..28de15aabf3e 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -80,13 +80,13 @@ class SfxViewFrame; class SfxRequest; -class ShowWindow; namespace sd { class SlideShowView; class AnimationSlideController; class PaneHider; +class ShowWindow; struct PresentationSettingsEx : public PresentationSettings { @@ -331,7 +331,7 @@ private: SdDrawDocument* mpDoc; VclPtr<vcl::Window> mpParentWindow; - VclPtr<ShowWindow> mpShowWindow; + VclPtr<sd::ShowWindow> mpShowWindow; VclPtr<PushButton> mpTimeButton; std::shared_ptr< AnimationSlideController > mpSlideController; |