summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-10-07 19:23:51 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-10-07 19:24:59 (GMT)
commit3fafb8bb9387d859bc187c23db6efac90c8683d4 (patch)
treecd94ab5dd12e97f639951f5a6588bc560b50b09f
parentf17433cc4d1054dbae8002a1995e0b632e26124a (diff)
downloadswift-contrib-3fafb8bb9387d859bc187c23db6efac90c8683d4.zip
swift-contrib-3fafb8bb9387d859bc187c23db6efac90c8683d4.tar.bz2
Fixed CLang warnings.
-rw-r--r--BuildTools/SCons/SConscript.boot2
-rw-r--r--Swift/Controllers/Roster/TableRoster.h2
-rw-r--r--Swiften/Parser/BOSHBodyExtractor.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
index 7148f6e..24a8b67 100644
--- a/BuildTools/SCons/SConscript.boot
+++ b/BuildTools/SCons/SConscript.boot
@@ -181,7 +181,7 @@ else :
if not env.get("allow_warnings", False) :
env.Append(CXXFLAGS = ["-Werror"])
gccVersion = env.get("CCVERSION", "0.0.0").split(".")
- if gccVersion >= ["4", "5", "0"] :
+ if gccVersion >= ["4", "5", "0"] and not "clang" in env["CC"] :
env.Append(CXXFLAGS = ["-Wlogical-op"])
if "clang" in env["CC"] :
env.Append(CXXFLAGS = ["-W#warnings", "-Wc++0x-compat", "-Waddress-of-temporary", "-Wambiguous-member-template", "-Warray-bounds", "-Watomic-properties", "-Wbind-to-temporary-copy", "-Wbuiltin-macro-redefined", "-Wc++-compat", "-Wc++0x-extensions", "-Wcomments", "-Wconditional-uninitialized", "-Wconstant-logical-operand", "-Wdeclaration-after-statement", "-Wdeprecated", "-Wdeprecated-implementations", "-Wdeprecated-writable-strings", "-Wduplicate-method-arg", "-Wempty-body", "-Wendif-labels", "-Wenum-compare", "-Wformat=2", "-Wfour-char-constants", "-Wgnu", "-Wincomplete-implementation", "-Winvalid-noreturn", "-Winvalid-offsetof", "-Winvalid-token-paste", "-Wlocal-type-template-args", "-Wmethod-signatures", "-Wmicrosoft", "-Wmissing-declarations", "-Wnon-pod-varargs", "-Wnonfragile-abi2", "-Wnull-dereference", "-Wout-of-line-declaration", "-Woverlength-strings", "-Wpacked", "-Wpointer-arith", "-Wpointer-sign", "-Wprotocol", "-Wreadonly-setter-attrs", "-Wselector", "-Wshift-overflow", "-Wshift-sign-overflow", "-Wstrict-selector-match", "-Wsuper-class-method-mismatch", "-Wtautological-compare", "-Wtypedef-redefinition", "-Wundeclared-selector", "-Wunknown-warning-option", "-Wunnamed-type-template-args", "-Wunused-exception-parameter", "-Wunused-member-function", "-Wused-but-marked-unused", "-Wvariadic-macros"])
diff --git a/Swift/Controllers/Roster/TableRoster.h b/Swift/Controllers/Roster/TableRoster.h
index 8ff16d0..d4612ed 100644
--- a/Swift/Controllers/Roster/TableRoster.h
+++ b/Swift/Controllers/Roster/TableRoster.h
@@ -66,7 +66,7 @@ namespace Swift {
void scheduleUpdate();
private:
- friend class SectionNameEquals;
+ friend struct SectionNameEquals;
struct Section {
Section(const std::string& name) : name(name) {
}
diff --git a/Swiften/Parser/BOSHBodyExtractor.h b/Swiften/Parser/BOSHBodyExtractor.h
index c263b1b..07203ae 100644
--- a/Swiften/Parser/BOSHBodyExtractor.h
+++ b/Swiften/Parser/BOSHBodyExtractor.h
@@ -12,7 +12,7 @@
#include <Swiften/Parser/XMLParserClient.h>
namespace Swift {
- struct XMLParserFactory;
+ class XMLParserFactory;
class BOSHBodyExtractor {
friend class BOSHBodyParserClient;