diff options
| -rw-r--r-- | gtk/makefile | 5 | ||||
| -rw-r--r-- | include/Platform.h | 6 | ||||
| -rw-r--r-- | include/WindowAccessor.h | 2 | ||||
| -rw-r--r-- | src/Document.h | 6 | ||||
| -rw-r--r-- | src/DocumentAccessor.h | 2 | ||||
| -rw-r--r-- | src/ExternalLexer.h | 2 | ||||
| -rw-r--r-- | src/LexCaml.cxx | 10 | ||||
| -rw-r--r-- | src/LexSML.cxx | 10 | ||||
| -rw-r--r-- | src/Style.h | 2 |
9 files changed, 23 insertions, 22 deletions
diff --git a/gtk/makefile b/gtk/makefile index 5ae6506dc..93814fe36 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -7,8 +7,13 @@ # Also works with ming32-make on Windows. .SUFFIXES: .cxx .c .o .h .a +ifdef CLANG +CC = clang +CCOMP = clang +else CC = g++ CCOMP = gcc +endif AR = ar RANLIB = touch diff --git a/include/Platform.h b/include/Platform.h index b5d6d9bf8..ea9f97298 100644 --- a/include/Platform.h +++ b/include/Platform.h @@ -314,8 +314,8 @@ private: Surface(const Surface &) {} Surface &operator=(const Surface &) { return *this; } public: - Surface() {}; - virtual ~Surface() {}; + Surface() {} + virtual ~Surface() {} static Surface *Allocate(); virtual void Init(WindowID wid)=0; @@ -474,7 +474,7 @@ public: */ class DynamicLibrary { public: - virtual ~DynamicLibrary() {}; + virtual ~DynamicLibrary() {} /// @return Pointer to function "name", or NULL on failure. virtual Function FindFunction(const char *name) = 0; diff --git a/include/WindowAccessor.h b/include/WindowAccessor.h index 6f265f658..4a8640748 100644 --- a/include/WindowAccessor.h +++ b/include/WindowAccessor.h @@ -53,7 +53,7 @@ public: } void StartAt(unsigned int start, char chMask=31); - void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; }; + void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; } unsigned int GetStartSegment() { return startSeg; } void StartSegment(unsigned int pos); void ColourTo(unsigned int pos, int chAttr); diff --git a/src/Document.h b/src/Document.h index 55df77fcb..8bd047b23 100644 --- a/src/Document.h +++ b/src/Document.h @@ -32,10 +32,10 @@ public: Range(Position pos=0) : start(pos), end(pos) { - }; + } Range(Position start_, Position end_) : start(start_), end(end_) { - }; + } bool Valid() const { return (start != invalidPosition) && (end != invalidPosition); @@ -118,7 +118,7 @@ struct StyledText { class CaseFolder { public: virtual ~CaseFolder() { - }; + } virtual size_t Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) = 0; }; diff --git a/src/DocumentAccessor.h b/src/DocumentAccessor.h index 39a0f2521..eb877d6d1 100644 --- a/src/DocumentAccessor.h +++ b/src/DocumentAccessor.h @@ -63,7 +63,7 @@ public: WindowID GetWindow() { return id; } void StartAt(unsigned int start, char chMask=31); - void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; }; + void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; } unsigned int GetStartSegment() { return startSeg; } void StartSegment(unsigned int pos); void ColourTo(unsigned int pos, int chAttr); diff --git a/src/ExternalLexer.h b/src/ExternalLexer.h index 913098ddc..eb2bad5d1 100644 --- a/src/ExternalLexer.h +++ b/src/ExternalLexer.h @@ -42,7 +42,7 @@ public: strncpy(name, languageName_, sizeof(name)); name[sizeof(name)-1] = '\0'; languageName = name; - }; + } virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle, WordList *keywordlists[], Accessor &styler) const; virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle, diff --git a/src/LexCaml.cxx b/src/LexCaml.cxx index 0d1162259..ca1b65f38 100644 --- a/src/LexCaml.cxx +++ b/src/LexCaml.cxx @@ -430,13 +430,11 @@ void ColouriseCamlDoc( static #endif /* BUILD_AS_EXTERNAL_LEXER */ void FoldCamlDoc( - unsigned int startPos, int length, - int initStyle, - WordList *keywordlists[], - Accessor &styler) + unsigned int, int, + int, + WordList *[], + Accessor &) { - // below useless evaluation(s) to supress "not used" warnings - startPos || length || initStyle || keywordlists[0] || styler.Length(); } static const char * const camlWordListDesc[] = { diff --git a/src/LexSML.cxx b/src/LexSML.cxx index a61753077..a41b4c10d 100644 --- a/src/LexSML.cxx +++ b/src/LexSML.cxx @@ -203,13 +203,11 @@ void ColouriseSMLDoc( } void FoldSMLDoc( - unsigned int startPos, int length, - int initStyle, - WordList *keywordlists[], - Accessor &styler) + unsigned int, int, + int, + WordList *[], + Accessor &) { - //supress "not used" warnings - startPos || length || initStyle || keywordlists[0] || styler.Length(); } static const char * const SMLWordListDesc[] = { diff --git a/src/Style.h b/src/Style.h index 0be3d4f07..c1f87e1b3 100644 --- a/src/Style.h +++ b/src/Style.h @@ -54,7 +54,7 @@ public: void ClearTo(const Style &source); bool EquivalentFontTo(const Style *other) const; void Realise(Surface &surface, int zoomLevel, Style *defaultStyle = 0, int extraFontFlag = 0); - bool IsProtected() const { return !(changeable && visible);}; + bool IsProtected() const { return !(changeable && visible);} }; #ifdef SCI_NAMESPACE |