| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | From c673a76857cbe0ca82fa11aea9b70f94c3e5b041 Mon Sep 17 00:00:00 2001 |
| 2 | From: Peter Williams <peter@newton.cx> |
| 3 | Date: Sat, 19 Dec 2015 21:08:46 -0500 |
| 4 | Subject: [PATCH] tools/generate_proxy.cpp: avoid possibly undefined 'uint' |
| 5 | type |
| 6 | MIME-Version: 1.0 |
| 7 | Content-Type: text/plain; charset=UTF-8 |
| 8 | Content-Transfer-Encoding: 8bit |
| 9 | |
| 10 | --- |
| 11 | Upstream-Status: Backport [https://github.com/andreas-volz/dbus-cplusplus/commit/43f119a2b3fe951c0f1d88cc61170d4c81a88880] |
| 12 | Signed-off-by: André Draszik <adraszik@tycoint.com> |
| 13 | tools/generate_proxy.cpp | 8 ++++---- |
| 14 | 1 file changed, 4 insertions(+), 4 deletions(-) |
| 15 | |
| 16 | diff --git a/tools/generate_proxy.cpp b/tools/generate_proxy.cpp |
| 17 | index bf1094a..ebb75fa 100644 |
| 18 | --- a/tools/generate_proxy.cpp |
| 19 | +++ b/tools/generate_proxy.cpp |
| 20 | @@ -352,7 +352,7 @@ void generate_proxy(Xml::Document &doc, const char *filename) |
| 21 | if (!arg_name.length()) |
| 22 | { |
| 23 | arg_name = "argin"; |
| 24 | - arg_name += toString <uint> (i); |
| 25 | + arg_name += toString <unsigned int> (i); |
| 26 | } |
| 27 | |
| 28 | // generate extra code to wrap object |
| 29 | @@ -445,7 +445,7 @@ void generate_proxy(Xml::Document &doc, const char *filename) |
| 30 | |
| 31 | if (!arg_name.length()) |
| 32 | { |
| 33 | - arg_name = "argout" + toString <uint> (i); |
| 34 | + arg_name = "argout" + toString <unsigned int> (i); |
| 35 | } |
| 36 | |
| 37 | if (arg_object.length()) |
| 38 | @@ -569,7 +569,7 @@ void generate_proxy(Xml::Document &doc, const char *filename) |
| 39 | // use a default if no arg name given |
| 40 | if (!arg_name.length()) |
| 41 | { |
| 42 | - arg_name = "arg" + toString <uint> (i); |
| 43 | + arg_name = "arg" + toString <unsigned int> (i); |
| 44 | } |
| 45 | |
| 46 | body << arg_name << ";" << endl; |
| 47 | @@ -605,7 +605,7 @@ void generate_proxy(Xml::Document &doc, const char *filename) |
| 48 | |
| 49 | if (!arg_name.length()) |
| 50 | { |
| 51 | - arg_name = "arg" + toString <uint> (j); |
| 52 | + arg_name = "arg" + toString <unsigned int> (j); |
| 53 | } |
| 54 | |
| 55 | if (arg_object.length()) |
| 56 | -- |
| 57 | 2.10.2 |
| 58 | |