Skip to content
Snippets Groups Projects
Commit 9e628f3b authored by Arnaud Degroote's avatar Arnaud Degroote
Browse files

[wip/jafar-gdhe] Add a patch to fix invalid use of reserved name

parent a62f70de
No related branches found
No related tags found
No related merge requests found
PKGVERSION= 0.1
PKGREVISION= 1
DISTNAME= jafar-gdhe-0.1
PKGNAME= jafar-gdhe-0.1
CATEGORIES= wip
......
SHA1 (jafar-gdhe-0.1.tar.gz) = 111dacc0840e84313f4b0ed5acf9c90cbf36d385
RMD160 (jafar-gdhe-0.1.tar.gz) = 84a10b3396fbe60c32e6a31e2c8f442974b30623
Size (jafar-gdhe-0.1.tar.gz) = 42156 bytes
SHA1 (patch-aa) = 144228b789794fdc3afc8f1cc5bf46149d54229e
diff --git a/include/gdhe/client.hpp b/include/gdhe/client.hpp
Don't use reserved name as variable declaration
index 26a55f4..d7b8de3 100644
--- include/gdhe/client.hpp
+++ include/gdhe/client.hpp
@@ -197,8 +197,8 @@ namespace gdhe {
void setBackgroundColor(ColorRGB &_color)
{ backgroundColor = _color; }
- void setBackgroundColor(unsigned char _R, unsigned char _G, unsigned char _B)
- { backgroundColor.R = _R; backgroundColor.G = _G; backgroundColor.B = _B; }
+ void setBackgroundColor(unsigned char R_, unsigned char G_, unsigned char B_)
+ { backgroundColor.R = R_; backgroundColor.G = G_; backgroundColor.B = B_; }
void addObject(Object *object, bool visible = true);
void addSubObject(Object *object, Object *parent, std::string suffix, bool visible = true);
@@ -267,9 +267,9 @@ namespace gdhe {
Object(double _x, double _y, double _z, double _yaw, double _pitch, double _roll):
poseModified(true), attributesModified(true), label(NULL), ownId(false), id(0), ids(""), client(NULL)
{ setPose(_x,_y,_z,_yaw,_pitch,_roll); }
- Object(double _x, double _y, double _z, double _yaw, double _pitch, double _roll, unsigned char _R, unsigned char _G, unsigned char _B):
+ Object(double _x, double _y, double _z, double _yaw, double _pitch, double _roll, unsigned char R_, unsigned char G_, unsigned char B_):
poseModified(true), attributesModified(true), label(NULL), ownId(false), id(0), ids(""), client(NULL)
- { setPose(_x,_y,_z,_yaw,_pitch,_roll); setColor(_R,_G,_B); }
+ { setPose(_x,_y,_z,_yaw,_pitch,_roll); setColor(R_,G_,B_); }
virtual ~Object();
virtual const std::string construct_string() const = 0;
@@ -336,12 +336,12 @@ namespace gdhe {
void setColor(ColorRGB &_color)
{ color = _color; touch(); }
- void setColor(unsigned char _R, unsigned char _G, unsigned char _B)
- { color.R = _R; color.G = _G; color.B = _B; touch(); }
+ void setColor(unsigned char R_, unsigned char G_, unsigned char B_)
+ { color.R = R_; color.G = G_; color.B = B_; touch(); }
void setLabel(std::string text);
void setLabelColor(ColorRGB &_color);
- void setLabelColor(unsigned char _R, unsigned char _G, unsigned char _B);
+ void setLabelColor(unsigned char R_, unsigned char G_, unsigned char B_);
void setLabelShift(double x_, double y_, double z_);
friend class Client;
diff --git a/src/client.cpp b/src/client.cpp
index 5a1027e..4299c41 100644
--- src/client.cpp
+++ src/client.cpp
@@ -60,8 +60,8 @@ namespace gdhe {
}
void Object::setLabelColor(ColorRGB &_color)
{ if (!label) createLabel(); label->setColor(_color); }
- void Object::setLabelColor(unsigned char _R, unsigned char _G, unsigned char _B)
- { if (!label) createLabel(); label->setColor(_R,_G,_B); }
+ void Object::setLabelColor(unsigned char R_, unsigned char G_, unsigned char B_)
+ { if (!label) createLabel(); label->setColor(R_,G_,B_); }
void Object::setLabelShift(double x_, double y_, double z_)
{ if (!label) createLabel(); label->setShift(x_,y_,z_); }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment