/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1996--2011 Han-Wen Nienhuys, <hanwen@xs4all.nl>
+ Copyright (C) 1996--2015 Han-Wen Nienhuys, <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
assert (*optnm);
char const *endopt = strchr (optnm, '=');
- int searchlen = (endopt) ? endopt - optnm : strlen (optnm);
+ size_t searchlen = (endopt) ? (size_t) (endopt - optnm) : strlen (optnm);
found_option_ = 0;
for (int i = 0; i < table_len_; i++)
{
string str;
if (shortname_char_)
- str += "-" + shortname_char_;
+ str += string ("-") + shortname_char_;
if (shortname_char_ && longname_str0_)
str += ", ";
if (longname_str0_)
- str += string ("`--") + longname_str0_ + "'";
+ str += string ("--") + longname_str0_;
return str;
}
{
string tabstr = "";
- int wid = 0;
+ size_t wid = 0;
for (int i = 0; l[i].shortname_char_ || l[i].longname_str0_; i++)
- wid = max (int (wid), int (l[i].str_for_help ().length ()));
+ wid = max (wid, l[i].str_for_help ().length ());
for (int i = 0; l[i].shortname_char_ || l[i].longname_str0_; i++)
{