mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-01-30 15:52:12 +01:00
LP-30 fix minor compilation warning about copy constructor
This commit is contained in:
parent
a1ac5fb532
commit
0efa0131e1
12
make/3rdparty/osgearth/osg-3.4.patch
vendored
12
make/3rdparty/osgearth/osg-3.4.patch
vendored
@ -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
|
diff --git a/include/osgViewer/View b/include/osgViewer/View
|
||||||
index 472b489..07ef9ce 100644
|
index 472b489..07ef9ce 100644
|
||||||
--- a/include/osgViewer/View
|
--- a/include/osgViewer/View
|
||||||
|
13
make/3rdparty/osgearth/osgearth-2.7.patch
vendored
Normal file
13
make/3rdparty/osgearth/osgearth-2.7.patch
vendored
Normal file
@ -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<osg::Object>
|
||||||
|
{
|
||||||
|
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 */
|
Loading…
x
Reference in New Issue
Block a user