diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-01-17 18:22:08 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-01-17 18:22:08 +0300 |
commit | 5eeb34b86751fff15a59702ce13a772bd39fd338 (patch) | |
tree | d829d1a214af00fa3621ea3c30949101c672bbcf | |
parent | fdab79795551b8383751682bf26362ed7b82da7a (diff) | |
download | manaverse-5eeb34b86751fff15a59702ce13a772bd39fd338.tar.gz manaverse-5eeb34b86751fff15a59702ce13a772bd39fd338.tar.bz2 manaverse-5eeb34b86751fff15a59702ce13a772bd39fd338.tar.xz manaverse-5eeb34b86751fff15a59702ce13a772bd39fd338.zip |
Add missing A_DEFAULT_COPY / A_DELETE_COPY into particle.
-rw-r--r-- | src/particle/particleemitter.h | 2 | ||||
-rw-r--r-- | src/particle/particleemitterprop.h | 2 | ||||
-rw-r--r-- | src/particle/particleinfo.h | 2 | ||||
-rw-r--r-- | src/particle/particletimer.h | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/src/particle/particleemitter.h b/src/particle/particleemitter.h index ca560953b..0d5110e77 100644 --- a/src/particle/particleemitter.h +++ b/src/particle/particleemitter.h @@ -55,6 +55,8 @@ class ParticleEmitter final */ ParticleEmitter(const ParticleEmitter &o); + A_DEFAULT_COPY(ParticleEmitter) + /** * Assignment operator that calls the copy constructor */ diff --git a/src/particle/particleemitterprop.h b/src/particle/particleemitterprop.h index 3acfe88f6..0bc35ae14 100644 --- a/src/particle/particleemitterprop.h +++ b/src/particle/particleemitterprop.h @@ -41,6 +41,8 @@ template <typename T> struct ParticleEmitterProp final { } + A_DEFAULT_COPY(ParticleEmitterProp) + void set(const T min, const T max) { minVal = min; diff --git a/src/particle/particleinfo.h b/src/particle/particleinfo.h index ebf7a47a4..901457a36 100644 --- a/src/particle/particleinfo.h +++ b/src/particle/particleinfo.h @@ -33,6 +33,8 @@ struct ParticleInfo final { } + A_DELETE_COPY(ParticleInfo) + std::vector<std::string> files; std::vector<Particle*> particles; }; diff --git a/src/particle/particletimer.h b/src/particle/particletimer.h index 083ad6503..5a4e5045a 100644 --- a/src/particle/particletimer.h +++ b/src/particle/particletimer.h @@ -34,6 +34,8 @@ struct ParticleTimer final { } + A_DEFAULT_COPY(ParticleTimer) + Particle *const particle; const time_t endTime; }; |