diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2014-09-09 04:22:19 +0000 |
|---|---|---|
| committer | CI bot <ps-jenkins@lists.canonical.com> | 2014-09-09 04:22:19 +0000 |
| commit | 2720a578326d51a49f00e3e4e69d86f8ba23ab0d (patch) | |
| tree | 383d4b9a64d0ad6601b00fe30d39d8f72ef9a7a2 /tests/glib-fixture.h | |
| parent | 4b15eb106da8764c3bd12e746b8f19bf458b7470 (diff) | |
| parent | 0c312c160b796c6c724c26e8a1063843c23b9ba3 (diff) | |
| download | ayatana-indicator-power-2720a578326d51a49f00e3e4e69d86f8ba23ab0d.tar.gz ayatana-indicator-power-2720a578326d51a49f00e3e4e69d86f8ba23ab0d.tar.bz2 ayatana-indicator-power-2720a578326d51a49f00e3e4e69d86f8ba23ab0d.zip | |
Add support for UPower 0.99. Fixes: 1330037
Approved by: Ted Gould, PS Jenkins bot
Diffstat (limited to 'tests/glib-fixture.h')
| -rw-r--r-- | tests/glib-fixture.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/glib-fixture.h b/tests/glib-fixture.h index d333ab2..ce834a0 100644 --- a/tests/glib-fixture.h +++ b/tests/glib-fixture.h @@ -64,7 +64,7 @@ class GlibFixture : public ::testing::Test const gchar * message, gpointer self) { - auto tmp = g_strdup_printf ("%s:%d \"%s\"", log_domain, (int)log_level, message); + auto tmp = g_strdup_printf ("%s:%d \"%s\"", log_domain, int(log_level), message); static_cast<GlibFixture*>(self)->log[log_level].push_back(tmp); g_free(tmp); } @@ -101,7 +101,7 @@ class GlibFixture : public ::testing::Test static gboolean wait_for_signal__timeout(gpointer name) { - g_error("%s: timed out waiting for signal '%s'", G_STRLOC, (char*)name); + g_error("%s: timed out waiting for signal '%s'", G_STRLOC, static_cast<char*>(name)); return G_SOURCE_REMOVE; } |