5 files changed, 16 insertions, 18 deletions
diff --git a/Documentation/BuildingOnUnix.txt b/Documentation/BuildingOnUnix.txt
index 8de73c8..fa5759e 100644
--- a/Documentation/BuildingOnUnix.txt
+++ b/Documentation/BuildingOnUnix.txt
@@ -20,6 +20,9 @@ Running tests
 -------------
 - Run
 		./scons test=unit
-	for running the unit tests, or
-		./scons test=all
-	for running all tests.
+	for running the unit tests.
+
+Installing
+----------
+- To install swift in /usr/local, run
+		./scons SWIFT_INSTALLDIR=/usr/local /usr/local
diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoPayload.h b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoPayload.h
index 7533a1e..62ea495 100644
--- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoPayload.h
+++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoPayload.h
@@ -8,9 +8,8 @@
 
 #include <Swiften/Swiften.h>
 
-using namespace Swift;
 //...
-class EchoPayload : public Payload {
+class EchoPayload : public Swift::Payload {
 	public:
 		EchoPayload() {}
 
diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoPayloadParserFactory.h b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoPayloadParserFactory.h
index 9cbb795..33a8c41 100644
--- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoPayloadParserFactory.h
+++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoPayloadParserFactory.h
@@ -9,9 +9,7 @@
 #include <Swiften/Swiften.h>
 #include "EchoPayload.h"
 
-using namespace Swift;
-
-class EchoPayloadParser : public GenericPayloadParser<EchoPayload> {
+class EchoPayloadParser : public Swift::GenericPayloadParser<EchoPayload> {
 	public:
 		EchoPayloadParser() : currentDepth(0) {}
 
@@ -36,7 +34,7 @@ class EchoPayloadParser : public GenericPayloadParser<EchoPayload> {
 		std::string currentText;
 };
 
-class EchoPayloadParserFactory : public GenericPayloadParserFactory<EchoPayloadParser> {
+class EchoPayloadParserFactory : public Swift::GenericPayloadParserFactory<EchoPayloadParser> {
 	public:
 		EchoPayloadParserFactory() :
 			GenericPayloadParserFactory<EchoPayloadParser>("echo", "http://swift.im/echo") {}
diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoPayloadSerializer.h b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoPayloadSerializer.h
index 85e8e67..068113c 100644
--- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoPayloadSerializer.h
+++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoPayloadSerializer.h
@@ -9,9 +9,7 @@
 #include <Swiften/Swiften.h>
 #include "EchoPayload.h"
 
-using namespace Swift;
-
-class EchoPayloadSerializer : public GenericPayloadSerializer<EchoPayload> {
+class EchoPayloadSerializer : public Swift::GenericPayloadSerializer<EchoPayload> {
 	public:
 		std::string serializePayload(boost::shared_ptr<EchoPayload> payload) const {
 			XMLElement element("echo", "http://swift.im/protocol/echo");
diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript
index 1960609..c6349bd 100644
--- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript
+++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript
@@ -15,11 +15,11 @@ if env["PLATFORM"] == "win32" :
 	if int(env["MSVS_VERSION"].split(".")[0]) >= 10 :
 		cpp0x = True
 else :
-	pass
-# Disabling C++0x compilation, because older boosts are not compliant yet
-#	if env["CCVERSION"].split(".") >= ["4", "5", "0"] :
-#		cpp0x = True
-#		cpp0x_env.Replace(CXXFLAGS = [flag for flag in env["CXXFLAGS"] if flag != "-Werror"])
-#		cpp0x_env.Append(CXXFLAGS = ["-std=c++0x"])
+	if env["CCVERSION"].split(".") >= ["4", "5", "0"] :
+		# Temporarily disabling c++0x mode because of problems with boost::thread
+		# on some platforms
+		#cpp0x = True
+		cpp0x_env.Replace(CXXFLAGS = [flag for flag in env["CXXFLAGS"] if flag != "-Werror"])
+		cpp0x_env.Append(CXXFLAGS = ["-std=c++0x"])
 if cpp0x :
 	cpp0x_env.Program("EchoBot0x", "EchoBot0x.cpp")