diff options
| author | wl <wl> | 2004-10-15 05:08:35 +0000 |
|---|---|---|
| committer | wl <wl> | 2004-10-15 05:08:35 +0000 |
| commit | ad6de87c27b848a7fe1dc11751af77b0f5bf8da1 (patch) | |
| tree | 6c5db772d705ce089442cec9356cdb28b30c46e4 /src/devices/grohtml | |
| parent | 6830c4ce4f03f5ffc462c538e6968337c210ee29 (diff) | |
| download | groff-ad6de87c27b848a7fe1dc11751af77b0f5bf8da1.tar.gz | |
* src/devices/grohtml/html-text.cpp (html_text_get_alignment),
src/devices/grohtml/post-html.cpp (make_val,
html_printer::handle_state_assertion): Fix compiler warnings.
* src/roff/troff/div.cpp: Include `stringclass.h' and `mtsm.h'.
(diversion::diversion): Fix order of initializers.
* src/roff/troff/div.h: Don't include `mtsm.h'.
* src/roff/troff/env.cpp: Include `stringclass.h' and `mtsm.h'.
(environment::environment): Fix order of initializers.
(environment::make_tag, environment::construct_format_state): Fix
compiler warnings.
* src/roff/troff/input.cpp: Include `stringclass.h' and `mtsm.h'.
(input_iterator::input_iterator, macro::macro): Fix order of
initializers.
* src/roff/troff/mtsm.cpp: Include only necessary header files.
(state_set::add, state_set::val): Fix compiler warnings.
* src/roff/troff/mtsm.h: Don't include `stringclass.h'.
(bool_value_state, int_value_state, units_value_state,
string_value_state): Remove comma after last element which causes
an error with g++ 3.3.3.
* src/roff/troff/node.cpp: Include `stringclass.h'.
(hline_node::hline_node, vline_node::vline_node,
space_char_hmotion_node, left_italic_corrected_node): Fix compiler
warnings.
(zero_width_node::zero_width_node): Fix order of initializers.
* src/roff/troff/node.h: Don't include `mtsm.h'.
(hmotion_node): Fix compiler warnings.
* src/roff/troff/number.cpp: Include `stringclass.h' and `mtsm.h'.
Diffstat (limited to 'src/devices/grohtml')
| -rw-r--r-- | src/devices/grohtml/html-text.cpp | 2 | ||||
| -rw-r--r-- | src/devices/grohtml/post-html.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/devices/grohtml/html-text.cpp b/src/devices/grohtml/html-text.cpp index d98d64e1..ba5b03be 100644 --- a/src/devices/grohtml/html-text.cpp +++ b/src/devices/grohtml/html-text.cpp @@ -975,7 +975,7 @@ char *html_text::get_alignment (void) p = p->next; } } - return ""; + return (char *)""; } /* diff --git a/src/devices/grohtml/post-html.cpp b/src/devices/grohtml/post-html.cpp index 5a3e48a9..ef7b6b1d 100644 --- a/src/devices/grohtml/post-html.cpp +++ b/src/devices/grohtml/post-html.cpp @@ -4637,9 +4637,9 @@ char *make_val (char *s, int v, char *id, char *f, char *l) t++; if (atoi(t) != v) { if (f == NULL) - f = "stdin"; + f = (char *)"stdin"; if (l == NULL) - l = "<none>"; + l = (char *)"<none>"; fprintf(stderr, "%s:%s: grohtml assertion failed at id%s expecting %d and was given %s\n", f, l, id, v, s); } @@ -4687,7 +4687,7 @@ void html_printer::handle_state_assertion (text_glob *g) char *n = (char *)&g->text_string[11]; char *cmd = get_str(n, &n); char *val = get_str(n, &n); - char *id = get_str(n, &n); // unused + (void)get_str(n, &n); // unused char *file= get_str(n, &n); char *line= get_str(n, &n); |