summaryrefslogtreecommitdiffstats
path: root/tdeioslave
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2018-08-18 11:41:35 +0200
committerSlávek Banko <slavek.banko@axis.cz>2018-08-18 11:41:35 +0200
commit2bcacaf3312aa854cbe81ba4c33a647f2e79287f (patch)
tree0f48a7a0fedf5db3a3809b4106221fa4ff286e00 /tdeioslave
parent42974b5ab6169981c56abdd610be3f2826abaffa (diff)
downloadtdebase-2bcacaf3312aa854cbe81ba4c33a647f2e79287f.tar.gz
tdebase-2bcacaf3312aa854cbe81ba4c33a647f2e79287f.zip
Fix FTBFS with stricter C++11
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'tdeioslave')
-rw-r--r--tdeioslave/man/man2html.cpp8
-rw-r--r--tdeioslave/media/mediamanager/halbackend.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/tdeioslave/man/man2html.cpp b/tdeioslave/man/man2html.cpp
index eee3ac80..8dd23dc6 100644
--- a/tdeioslave/man/man2html.cpp
+++ b/tdeioslave/man/man2html.cpp
@@ -656,7 +656,7 @@ static void fill_old_character_definitions( void )
for (size_t i = 0; i < sizeof(standardchar)/sizeof(CSTRDEF); i++)
{
const int nr = standardchar[i].nr;
- const char temp[3] = { nr / 256, nr % 256, 0 };
+ const char temp[3] = { (char)(nr / 256), (char)(nr % 256), 0 };
TQCString name( temp );
s_characterDefinitionMap.insert( name, StringDefinition( standardchar[i].slen, standardchar[i].st ) );
}
@@ -3713,7 +3713,7 @@ static char *scan_request(char *c)
}
case REQ_Fo: // mdoc(7) "Function definition Opening"
{
- char* font[2] = { "B", "R" };
+ const char* font[2] = { "B", "R" };
c+=j;
if (*c=='\n') c++;
char *eol=strchr(c,'\n');
@@ -3748,7 +3748,7 @@ static char *scan_request(char *c)
// .Fc has no parameter
c+=j;
c=skip_till_newline(c);
- char* font[2] = { "B", "R" };
+ const char* font[2] = { "B", "R" };
out_html(set_font(font[i&1]));
out_html(")");
out_html(set_font("R"));
@@ -3764,7 +3764,7 @@ static char *scan_request(char *c)
}
case REQ_Fa: // mdoc(7) "Function definition argument"
{
- char* font[2] = { "B", "R" };
+ const char* font[2] = { "B", "R" };
c+=j;
if (*c=='\n') c++;
sl=fill_words(c, wordlist, &words, true, &c);
diff --git a/tdeioslave/media/mediamanager/halbackend.cpp b/tdeioslave/media/mediamanager/halbackend.cpp
index 80d44339..637b16bf 100644
--- a/tdeioslave/media/mediamanager/halbackend.cpp
+++ b/tdeioslave/media/mediamanager/halbackend.cpp
@@ -1670,7 +1670,7 @@ TQString HALBackend::unmount(const TQString &_udi)
if (dbus_error_is_set(&error))
{
dbus_error_free(&error);
- return false;
+ return TQString();
}
if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi.latin1(),