Line
Link Here
|
0 |
-- src/eixTk/ptr_list.h |
0 |
++ src/eixTk/ptr_list.h |
Lines 47-53
Link Here
|
47 |
/// A list that only stores pointers to type. |
47 |
/// A list that only stores pointers to type. |
48 |
template<typename type> |
48 |
template<typename type> |
49 |
class ptr_list |
49 |
class ptr_list |
50 |
: virtual public std::list<type*> |
50 |
: public std::list<type*> |
51 |
{ |
51 |
{ |
52 |
public: |
52 |
public: |
53 |
using std::list<type*>::begin; |
53 |
using std::list<type*>::begin; |
54 |
-- src/output/formatstring.cc |
54 |
++ src/output/formatstring.cc |
Lines 278-284
Link Here
|
278 |
FormatParser::ParserState |
278 |
FormatParser::ParserState |
279 |
FormatParser::state_COLOR() |
279 |
FormatParser::state_COLOR() |
280 |
{ |
280 |
{ |
281 |
char *q = strchr(band_position, ')'); |
281 |
const char *q = strchr(band_position, ')'); |
282 |
if(q == NULL) { |
282 |
if(q == NULL) { |
283 |
last_error = _("'(' without closing ')'"); |
283 |
last_error = _("'(' without closing ')'"); |
284 |
return ERROR; |
284 |
return ERROR; |
Lines 299-305
Link Here
|
299 |
FormatParser::ParserState |
299 |
FormatParser::ParserState |
300 |
FormatParser::state_PROPERTY() |
300 |
FormatParser::state_PROPERTY() |
301 |
{ |
301 |
{ |
302 |
char *q = strchr(band_position, '>'); |
302 |
const char *q = strchr(band_position, '>'); |
303 |
if(q == NULL) { |
303 |
if(q == NULL) { |
304 |
last_error = _("'<' without closing '>'"); |
304 |
last_error = _("'<' without closing '>'"); |
305 |
return ERROR; |
305 |
return ERROR; |