Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
robotpkg-wip
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Gepetto
robotpkg-wip
Commits
9e628f3b
Commit
9e628f3b
authored
13 years ago
by
Arnaud Degroote
Browse files
Options
Downloads
Patches
Plain Diff
[wip/jafar-gdhe] Add a patch to fix invalid use of reserved name
parent
a62f70de
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
jafar-gdhe/Makefile
+1
-0
1 addition, 0 deletions
jafar-gdhe/Makefile
jafar-gdhe/distinfo
+1
-0
1 addition, 0 deletions
jafar-gdhe/distinfo
jafar-gdhe/patches/patch-aa
+60
-0
60 additions, 0 deletions
jafar-gdhe/patches/patch-aa
with
62 additions
and
0 deletions
jafar-gdhe/Makefile
+
1
−
0
View file @
9e628f3b
PKGVERSION
=
0.1
PKGREVISION
=
1
DISTNAME
=
jafar-gdhe-0.1
PKGNAME
=
jafar-gdhe-0.1
CATEGORIES
=
wip
...
...
This diff is collapsed.
Click to expand it.
jafar-gdhe/distinfo
+
1
−
0
View file @
9e628f3b
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
This diff is collapsed.
Click to expand it.
jafar-gdhe/patches/patch-aa
0 → 100644
+
60
−
0
View file @
9e628f3b
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_); }
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment