From 0efa0131e183c3e5f7ba810801733490ea34516d Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Thu, 3 Dec 2015 00:06:48 +0100 Subject: [PATCH] LP-30 fix minor compilation warning about copy constructor --- make/3rdparty/osgearth/osg-3.4.patch | 12 ++++++++++++ make/3rdparty/osgearth/osgearth-2.7.patch | 13 +++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 make/3rdparty/osgearth/osgearth-2.7.patch diff --git a/make/3rdparty/osgearth/osg-3.4.patch b/make/3rdparty/osgearth/osg-3.4.patch index 0b600ded1..e0a6d92ca 100644 --- a/make/3rdparty/osgearth/osg-3.4.patch +++ b/make/3rdparty/osgearth/osg-3.4.patch @@ -1,3 +1,15 @@ +diff --git a/include/osg/OperationThread b/include/osg/OperationThread +index a62157e..75adfba 100644 +--- a/include/osg/OperationThread ++++ b/include/osg/OperationThread +@@ -80,6 +80,7 @@ protected: + _keep(false) {} + + Operation(const Operation& op): ++ Referenced(), + _name(op._name), + _keep(op._keep) {} + diff --git a/include/osgViewer/View b/include/osgViewer/View index 472b489..07ef9ce 100644 --- a/include/osgViewer/View diff --git a/make/3rdparty/osgearth/osgearth-2.7.patch b/make/3rdparty/osgearth/osgearth-2.7.patch new file mode 100644 index 000000000..690eae3af --- /dev/null +++ b/make/3rdparty/osgearth/osgearth-2.7.patch @@ -0,0 +1,13 @@ +diff --git a/src/osgEarthSymbology/Resource b/src/osgEarthSymbology/Resource +index a8a1441..934fc7d 100644 +--- a/src/osgEarthSymbology/Resource ++++ b/src/osgEarthSymbology/Resource +@@ -33,7 +33,7 @@ namespace osgEarth { namespace Symbology + class OSGEARTHSYMBOLOGY_EXPORT Resource : public Taggable + { + protected: +- Resource(const Resource& rhs,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY) {}; ++ Resource(const Resource& rhs,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY) : Taggable() {}; + Resource( const Config& config =Config() ); + + /** dtor */