From 76077992159e83d3f9ce0c63da3095aaeae4f259 Mon Sep 17 00:00:00 2001 From: upstream svn Date: Sun, 11 Sep 2016 20:47:53 +0000 Subject: [PATCH] Whitespace and typo fixes --- .svn-revision | 2 +- BUILDING_MACOSX.txt | 4 ++-- docs/README.Asio.txt | 6 +++--- src/LibSocketAsio.cpp | 2 +- src/MuleCollection.h | 2 +- src/utils/scripts/denoiser.rules | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.svn-revision b/.svn-revision index 46e1e863..0413a11a 100644 --- a/.svn-revision +++ b/.svn-revision @@ -1 +1 @@ -10951 +10952 diff --git a/BUILDING_MACOSX.txt b/BUILDING_MACOSX.txt index 74c358f3..31b410e6 100644 --- a/BUILDING_MACOSX.txt +++ b/BUILDING_MACOSX.txt @@ -1,4 +1,4 @@ -To build on MacOSX, there are some experimental scripts located in src/utils/scripts/MacOSX +To build on MacOSX, there are some experimental scripts located in src/utils/scripts/MacOSX An example basic flow to create an SVN build is to do the following from the root folder where this file is located: @@ -8,7 +8,7 @@ cd Build/ WXVERSION=svn WXPORT=cocoa MULECLEAN=YES ../src/utils/scripts/MacOSX/full_build.sh -Those commands would build a MacOSX 10.6 (Snow Leopard) compatible application bundle for aMule and aMuleGUI +Those commands would build a MacOSX 10.6 (Snow Leopard) compatible application bundle for aMule and aMuleGUI using the architecture of the build system ( i386 or x86_64 ), with the latest SVN vesion of wxWidgets. Other parameters are explained upon execution of the script. diff --git a/docs/README.Asio.txt b/docs/README.Asio.txt index 49ee5bcf..656fee3a 100644 --- a/docs/README.Asio.txt +++ b/docs/README.Asio.txt @@ -8,7 +8,7 @@ I decided on Boost ASIO because of the good reputation of the Boost library. The goal is to have an aMule which can be configured to use either wx Sockets or ASIO sockets for all major tasks (this may exclude things like http download). -And with ASIO sockets it should perform better at least in some aspects +And with ASIO sockets it should perform better at least in some aspects (stability, speed, CPU, memory) for this endeavour to make sense. There are no plans to "boostify" aMule. Boost is encapsulated in the implementation @@ -31,7 +31,7 @@ are running aMule at high speeds. Compilation: -Get current boost lib from www.boost.org . Extract it to your favorite +Get current boost lib from www.boost.org . Extract it to your favorite place (like ~/amule/boost_1_49_0). Boost.Asio is header-only. It requires Boost.System for its error codes, but we include the single .cpp directly, so we don't need to build @@ -42,5 +42,5 @@ Configure aMule using or ./configure --with-boost=/path/to/boost/sources -Important: aMule prints "Asio thread started" in log and console on startup. +Important: aMule prints "Asio thread started" in log and console on startup. If it doesn't you have probably configured it to use wx sockets! diff --git a/src/LibSocketAsio.cpp b/src/LibSocketAsio.cpp index 34625da2..d7732e26 100644 --- a/src/LibSocketAsio.cpp +++ b/src/LibSocketAsio.cpp @@ -71,7 +71,7 @@ using namespace boost::asio; using namespace boost::system; // for error_code -static io_service s_io_service; +static io_service s_io_service; // Number of threads in the Asio thread pool const int CAsioService::m_numberOfThreads = 4; diff --git a/src/MuleCollection.h b/src/MuleCollection.h index 139a7451..d625a2a4 100644 --- a/src/MuleCollection.h +++ b/src/MuleCollection.h @@ -44,7 +44,7 @@ public: bool Open(const std::string &File); - size_t size() const { return vCollection.size(); } + size_t size() const { return vCollection.size(); } std::string& operator[](size_t index) { return vCollection[index]; } const std::string& operator[](size_t index) const { return vCollection[index]; } diff --git a/src/utils/scripts/denoiser.rules b/src/utils/scripts/denoiser.rules index 21b2226a..b71b3983 100644 --- a/src/utils/scripts/denoiser.rules +++ b/src/utils/scripts/denoiser.rules @@ -176,7 +176,7 @@ MAKEFLAGS=-w -s b 0 } - # ship the check target, otherwise test results would be stripped + # skip the check target, otherwise test results would be stripped /^check-TESTS$/ { s/.*// x -- 2.11.4.GIT