diff options
| author | Greg Ercolano <erco@seriss.com> | 2014-12-19 03:47:32 +0000 |
|---|---|---|
| committer | Greg Ercolano <erco@seriss.com> | 2014-12-19 03:47:32 +0000 |
| commit | 889a8a6d425baf7c0208d2bbd62947e1062db8e7 (patch) | |
| tree | cb2da85686c32de81633d69addab7f7b0d300262 | |
| parent | cdee5e204faaefd92eab79a8738da5982c990e6c (diff) | |
Fixes STR #3169, comments #4, #5 and #7.
Prevents warnings from the OSX 10.9.x clang compiler.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10493 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | fluid/CodeEditor.cxx | 4 | ||||
| -rw-r--r-- | src/Fl_Tree.cxx | 2 | ||||
| -rw-r--r-- | test/editor.cxx | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/fluid/CodeEditor.cxx b/fluid/CodeEditor.cxx index 78ece08de..c5fe85381 100644 --- a/fluid/CodeEditor.cxx +++ b/fluid/CodeEditor.cxx @@ -179,7 +179,9 @@ void CodeEditor::style_parse(const char *text, char *style, int length) { // Might be a keyword... for (temp = text, bufptr = buf; (islower(*temp) || *temp == '_') && bufptr < (buf + sizeof(buf) - 1); - *bufptr++ = *temp++); + *bufptr++ = *temp++) { + // nothing + } if (!islower(*temp) && *temp != '_') { *bufptr = '\0'; diff --git a/src/Fl_Tree.cxx b/src/Fl_Tree.cxx index 75befe164..218c38544 100644 --- a/src/Fl_Tree.cxx +++ b/src/Fl_Tree.cxx @@ -62,6 +62,7 @@ static void free_path(char **arr) { } } +#if 0 /* unused code -- STR #3169 */ // INTERNAL: Recursively descend 'item's tree hierarchy // accumulating total child 'count' // @@ -72,6 +73,7 @@ static int find_total_children(Fl_Tree_Item *item, int count=0) { } return(count); } +#endif /// Constructor. Fl_Tree::Fl_Tree(int X, int Y, int W, int H, const char *L) : Fl_Group(X,Y,W,H,L) { diff --git a/test/editor.cxx b/test/editor.cxx index 26cd1802a..e9a397e99 100644 --- a/test/editor.cxx +++ b/test/editor.cxx @@ -206,7 +206,9 @@ style_parse(const char *text, // Might be a keyword... for (temp = text, bufptr = buf; (islower((*temp)&255) || *temp == '_') && bufptr < (buf + sizeof(buf) - 1); - *bufptr++ = *temp++); + *bufptr++ = *temp++) { + // nothing + } if (!islower((*temp)&255) && *temp != '_') { *bufptr = '\0'; |