From 17b2ee69840a91adaed1681d06d56705f496b4d3 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Thu, 12 Dec 2013 16:46:17 -0800 Subject: [PATCH] Fix for obnoxious C++0x warning in GCC. --- libraries/particles/src/Particle.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/particles/src/Particle.h b/libraries/particles/src/Particle.h index bfdcbdd338..0fed2c80f0 100644 --- a/libraries/particles/src/Particle.h +++ b/libraries/particles/src/Particle.h @@ -57,7 +57,7 @@ public: const glm::vec3& getPosition() const { return _position; } const rgbColor& getColor() const { return _color; } - xColor getColor() { return { _color[RED_INDEX], _color[GREEN_INDEX], _color[BLUE_INDEX] }; } + xColor getColor() { xColor color = { _color[RED_INDEX], _color[GREEN_INDEX], _color[BLUE_INDEX] }; return color; } float getRadius() const { return _radius; } const glm::vec3& getVelocity() const { return _velocity; } const glm::vec3& getGravity() const { return _gravity; } @@ -144,4 +144,4 @@ private: }; -#endif /* defined(__hifi__Particle__) */ \ No newline at end of file +#endif /* defined(__hifi__Particle__) */