mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 05:53:50 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2613 from akortunov/warnfix3

Browse source 
Fix GCC9 warnings about implicit declarations
This commit is contained in:
Alexei Dobrohotov 2019-11-30 16:09:01 +03:00 committed by GitHub
commit c01324fdb2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwworld/containerstore.hpp
View file

@ -344,6 +344,7 @@ namespace MWWorld
ContainerStoreIteratorBase& operator++ ();
ContainerStoreIteratorBase operator++ (int);
ContainerStoreIteratorBase& operator= (const ContainerStoreIteratorBase& rhs);
ContainerStoreIteratorBase (const ContainerStoreIteratorBase& rhs) = default;
int getType() const;
const ContainerStore *getContainerStore() const;

2
apps/openmw/mwworld/store.hpp
View file

@ -92,6 +92,8 @@ namespace MWWorld
: mIter(iter)
{}
SharedIterator& operator=(const SharedIterator&) = default;
SharedIterator &operator++() {
++mIter;
return *this;

23
components/nifosg/particle.cpp
View file

@ -76,7 +76,14 @@ ParticleShooter::ParticleShooter()
ParticleShooter::ParticleShooter(const ParticleShooter &copy, const osg::CopyOp &copyop)
: osgParticle::Shooter(copy, copyop)
{
*this = copy;
mMinSpeed = copy.mMinSpeed;
mMaxSpeed = copy.mMaxSpeed;
mHorizontalDir = copy.mHorizontalDir;
mHorizontalAngle = copy.mHorizontalAngle;
mVerticalDir = copy.mVerticalDir;
mVerticalAngle = copy.mVerticalAngle;
mLifetime = copy.mLifetime;
mLifetimeRandom = copy.mLifetimeRandom;
}
void ParticleShooter::shoot(osgParticle::Particle *particle) const
@ -112,7 +119,9 @@ GrowFadeAffector::GrowFadeAffector()
GrowFadeAffector::GrowFadeAffector(const GrowFadeAffector& copy, const osg::CopyOp& copyop)
: osgParticle::Operator(copy, copyop)
{
*this = copy;
mGrowTime = copy.mGrowTime;
mFadeTime = copy.mFadeTime;
mCachedDefaultSize = copy.mCachedDefaultSize;
}
void GrowFadeAffector::beginOperate(osgParticle::Program *program)
@ -143,7 +152,7 @@ ParticleColorAffector::ParticleColorAffector()
ParticleColorAffector::ParticleColorAffector(const ParticleColorAffector &copy, const osg::CopyOp &copyop)
: osgParticle::Operator(copy, copyop)
{
*this = copy;
mData = copy.mData;
}
void ParticleColorAffector::operate(osgParticle::Particle* particle, double /* dt */)
@ -172,7 +181,13 @@ GravityAffector::GravityAffector()
GravityAffector::GravityAffector(const GravityAffector &copy, const osg::CopyOp &copyop)
: osgParticle::Operator(copy, copyop)
{
*this = copy;
mForce = copy.mForce;
mType = copy.mType;
mPosition = copy.mPosition;
mDirection = copy.mDirection;
mDecay = copy.mDecay;
mCachedWorldPosition = copy.mCachedWorldPosition;
mCachedWorldDirection = copy.mCachedWorldDirection;
}
void GravityAffector::beginOperate(osgParticle::Program* program)

8
components/nifosg/particle.hpp
View file

@ -78,6 +78,8 @@ namespace NifOsg
ParticleShooter();
ParticleShooter(const ParticleShooter& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY);
ParticleShooter& operator=(const ParticleShooter&) = delete;
META_Object(NifOsg, ParticleShooter)
virtual void shoot(osgParticle::Particle* particle) const;
@ -135,6 +137,8 @@ namespace NifOsg
GrowFadeAffector();
GrowFadeAffector(const GrowFadeAffector& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY);
GrowFadeAffector& operator=(const GrowFadeAffector&) = delete;
META_Object(NifOsg, GrowFadeAffector)
virtual void beginOperate(osgParticle::Program* program);
@ -155,6 +159,8 @@ namespace NifOsg
ParticleColorAffector();
ParticleColorAffector(const ParticleColorAffector& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY);
ParticleColorAffector& operator=(const ParticleColorAffector&) = delete;
META_Object(NifOsg, ParticleColorAffector)
virtual void operate(osgParticle::Particle* particle, double dt);
@ -170,6 +176,8 @@ namespace NifOsg
GravityAffector();
GravityAffector(const GravityAffector& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY);
GravityAffector& operator=(const GravityAffector&) = delete;
META_Object(NifOsg, GravityAffector)
virtual void operate(osgParticle::Particle* particle, double dt);