Merge pull request #11 from pocoproject/develop

sync 13.4.2015

ApacheConnector/include/ApacheConnector.h

@@ -33,7 +33,7 @@ class ApacheRequestRec
 
 	int readRequest(char* buffer, int length);
 		/// Read up to length bytes from request body into buffer.
-		/// Returns the number of bytes read, 0 if eof or -1 if an error occured.
+		/// Returns the number of bytes read, 0 if eof or -1 if an error occurred.
 
 	void writeResponse(const char* buffer, int length);
 		/// Writes the given characters as response to the given request_rec.

CMakeLists.txt

@@ -35,6 +35,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # Append our module directory to CMake
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
+# COMMENT REPLACED BY BIICODE
+
 #################################################################################
 # Setup C/C++ compiler options
 #################################################################################

CONTRIBUTORS

@@ -52,5 +52,6 @@ Björn Schramke
 Jonathan Seeley
 Tor Lillqvist
 Alexander Bychuk
+Francisco Ramírez
 --
 $Id$

CppParser/include/Poco/CppParser/NameSpace.h

@@ -66,7 +66,7 @@ class CppParser_API NameSpace: public Symbol
 
 	Symbol* lookup(const std::string& name) const;
 		/// Looks up the given name in the symbol table
-		/// and returns the corresponsing symbol, or null
+		/// and returns the corresponding symbol, or null
 		/// if no symbol can be found. The name can include
 		/// a namespace.
 
@@ -104,7 +104,7 @@ class CppParser_API NameSpace: public Symbol
 private:
 	Symbol* lookup(const std::string& name, std::set<const NameSpace*>& alreadyVisited) const;
 		/// Looks up the given name in the symbol table
-		/// and returns the corresponsing symbol, or null
+		/// and returns the corresponding symbol, or null
 		/// if no symbol can be found. The name can include
 		/// a namespace.
 

CppParser/src/Utility.cpp

@@ -93,7 +93,7 @@ void Utility::detectPrefixAndIncludes(const std::string& origHFile, std::vector<
 			++itTmp;
 			std::string defValue = *itTmp;
 			istr >> x;
-			// now find the corresponsing #define
+			// now find the corresponding #define
 			while (x.find(defValue) == std::string::npos)
 				istr >> x;
 			 //now parse until a class def is found without a ; at the end

CppUnit/include/CppUnit/Orthodox.h

@@ -17,7 +17,7 @@ namespace CppUnit {
 
 
 /*
- * Orthodox performs a simple set of tests on an arbitary
+ * Orthodox performs a simple set of tests on an arbitrary
  * class to make sure that it supports at least the
  * following operations:
  *

Crypto/include/Poco/Crypto/Cipher.h

@@ -37,7 +37,7 @@ class CryptoTransform;
 
 class Crypto_API Cipher: public Poco::RefCountedObject
 	/// Represents the abstract base class from which all implementations of
-	/// symmetric/assymetric encryption algorithms must inherit.  Use the CipherFactory
+	/// symmetric/asymmetric encryption algorithms must inherit.  Use the CipherFactory
 	/// class to obtain an instance of this class:
 	///
 	///     CipherFactory& factory = CipherFactory::defaultFactory();
@@ -57,7 +57,7 @@ class Crypto_API Cipher: public Poco::RefCountedObject
 	/// decrypt strings or, in conjunction with a CryptoInputStream or a
 	/// CryptoOutputStream, to encrypt streams of data.
 	///
-	/// Since encrypted strings will contain arbitary binary data that will cause
+	/// Since encrypted strings will contain arbitrary binary data that will cause
 	/// problems in applications that are not binary-safe (eg., when sending
 	/// encrypted data in e-mails), the encryptString() and decryptString() can
 	/// encode (or decode, respectively) encrypted data using a "transport encoding".
@@ -96,7 +96,7 @@ class Crypto_API Cipher: public Poco::RefCountedObject
 		ENC_BASE64       = 0x01, /// Base64-encoded output
 		ENC_BINHEX       = 0x02, /// BinHex-encoded output
 		ENC_BASE64_NO_LF = 0x81, /// Base64-encoded output, no linefeeds
-		ENC_BINHEX_NO_LF = 0x82, /// BinHex-encoded output, no linefeeds
+		ENC_BINHEX_NO_LF = 0x82  /// BinHex-encoded output, no linefeeds
 
 	};
 
@@ -107,7 +107,7 @@ class Crypto_API Cipher: public Poco::RefCountedObject
 		/// Returns the name of the Cipher.
 
 	virtual CryptoTransform* createEncryptor() = 0;
-		/// Creates an encrytor object to be used with a CryptoStream.
+		/// Creates an encryptor object to be used with a CryptoStream.
 
 	virtual CryptoTransform* createDecryptor() = 0;
 		/// Creates a decryptor object to be used with a CryptoStream.

Crypto/include/Poco/Crypto/CipherImpl.h

@@ -45,10 +45,10 @@ class CipherImpl: public Cipher
 		/// Returns the name of the cipher.
 
 	CryptoTransform* createEncryptor();
-		/// Creates an encrytor object.
+		/// Creates an encryptor object.
 
 	CryptoTransform* createDecryptor();
-		/// Creates a decrytor object.
+		/// Creates a decryptor object.
 
 private:
 	CipherKey _key;

Crypto/include/Poco/Crypto/OpenSSLInitializer.h

@@ -44,7 +44,7 @@ namespace Crypto {
 
 
 class Crypto_API OpenSSLInitializer
-	/// Initalizes the OpenSSL library.
+	/// Initializes the OpenSSL library.
 	///
 	/// The class ensures the earliest initialization and the
 	/// latest shutdown of the OpenSSL library.

Crypto/include/Poco/Crypto/RSACipherImpl.h

@@ -33,7 +33,7 @@ namespace Crypto {
 
 class RSACipherImpl: public Cipher
 	/// An implementation of the Cipher class for 
-	/// assymetric (public-private key) encryption
+	/// asymmetric (public-private key) encryption
 	/// based on the the RSA algorithm in OpenSSL's 
 	/// crypto library.
 	///
@@ -52,10 +52,10 @@ class RSACipherImpl: public Cipher
 		/// Returns the name of the Cipher.
 
 	CryptoTransform* createEncryptor();
-		/// Creates an encrytor object.
+		/// Creates an encryptor object.
 
 	CryptoTransform* createDecryptor();
-		/// Creates a decrytor object.
+		/// Creates a decryptor object.
 
 private:
 	RSAKey _key;

Crypto/include/Poco/Crypto/RSADigestEngine.h

@@ -86,7 +86,7 @@ class Crypto_API RSADigestEngine: public Poco::DigestEngine
 
 	const DigestEngine::Digest& signature();
 		/// Signs the digest using the RSA algorithm
-		/// and the private key (teh first time it's
+		/// and the private key (the first time it's
 		/// called) and returns the result.
 		///
 		/// Can be called multiple times.

Crypto/include/Poco/Crypto/X509Certificate.h

@@ -128,7 +128,7 @@ class Crypto_API X509Certificate
 		/// certificate.
 		///
 		/// Returns true if verification against the issuer certificate
-		/// was successfull, false otherwise.
+		/// was successful, false otherwise.
 
 	const X509* certificate() const;
 		/// Returns the underlying OpenSSL certificate.

DLLVersion.rc

@@ -4,8 +4,8 @@
 
 #include "winres.h"
 
-#define POCO_VERSION 1,6,0,0
-#define POCO_VERSION_STR "1.6.0"
+#define POCO_VERSION 1,7,0,0
+#define POCO_VERSION_STR "1.7.0"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION POCO_VERSION
@@ -28,7 +28,7 @@ BEGIN
             VALUE "FileDescription", "This file is part of the POCO C++ Libraries."
             VALUE "FileVersion", POCO_VERSION_STR
             VALUE "InternalName", "POCO"
-            VALUE "LegalCopyright", "Copyright (C) 2004-2014, Applied Informatics Software Engineering GmbH and Contributors."
+            VALUE "LegalCopyright", "Copyright (C) 2004-2015, Applied Informatics Software Engineering GmbH and Contributors."
             VALUE "ProductName", "POCO C++ Libraries - http://pocoproject.org"
             VALUE "ProductVersion", POCO_VERSION_STR
         END

Data/MySQL/include/Poco/Data/MySQL/MySQLException.h

@@ -93,7 +93,7 @@ class ConnectionException : public MySQLException
 
 
 class TransactionException : public ConnectionException
-	/// TrabsactionException
+	/// TransactionException
 {
 public:
 

Data/MySQL/include/Poco/Data/MySQL/Utility.h

@@ -57,7 +57,7 @@ class MySQL_API Utility
 		/// Returns host info.
 
 	static bool hasMicrosecond();
-		/// Rturns true if microseconds are suported.
+		/// Returns true if microseconds are supported.
 
 	static MYSQL* handle(Poco::Data::Session& session);
 		/// Returns native MySQL handle for the session.

Data/ODBC/include/Poco/Data/ODBC/Binder.h

@@ -559,7 +559,7 @@ class ODBC_API Binder: public Poco::Data::AbstractBinder
 		if (size == _maxFieldSize)
 		{
 			getMinValueSize(val, size);
-			// accomodate for terminating zero
+			// accommodate for terminating zero
 			if (size != _maxFieldSize) ++size;
 		}
 
@@ -625,7 +625,7 @@ class ODBC_API Binder: public Poco::Data::AbstractBinder
 		if (size == _maxFieldSize)
 		{
 			getMinValueSize(val, size);
-			// accomodate for terminating zero
+			// accommodate for terminating zero
 			if (size != _maxFieldSize) size += sizeof(UTF16Char);
 		}
 
@@ -942,7 +942,7 @@ class ODBC_API Binder: public Poco::Data::AbstractBinder
 		/// This function runs for query and stored procedure parameters (in and 
 		/// out-bound). Some drivers, however, do not care about knowing this 
 		/// information to start with. For that reason, after all the attempts 
-		/// to discover the required values are unsuccesfully exhausted, the values 
+		/// to discover the required values are unsuccessfully exhausted, the values 
 		/// are both set to zero and no exception is thrown.
 
 	void setParamSetSize(std::size_t length);

Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h

@@ -59,7 +59,7 @@ class ODBC_API SessionImpl: public Poco::Data::AbstractSessionImpl<SessionImpl>
 		bool autoBind = true,
 		bool autoExtract = true);
 		/// Creates the SessionImpl. Opens a connection to the database.
-		/// Throws NotConnectedException if connection was not succesful.
+		/// Throws NotConnectedException if connection was not successful.
 
 	//@ deprecated
 	SessionImpl(const std::string& connect, 

Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h

@@ -41,7 +41,7 @@ class ODBC_API TypeInfo
 	///
 	/// This class provides mapping between C and SQL datatypes as well
 	/// as datatypes supported by the underlying database. In order for database
-	/// types to be available, a valid conection handle must be supplied at either
+	/// types to be available, a valid connection handle must be supplied at either
 	/// object construction time, or at a later point in time, through call to
 	/// fillTypeInfo member function.
 	///

Data/ODBC/src/ODBCStatementImpl.cpp

@@ -380,7 +380,7 @@ std::string ODBCStatementImpl::nativeSQL()
 			delete [] pNative;
 			throw ConnectionException(_rConnection, "SQLNativeSql()");
 		}
-		++retlen;//accomodate for terminating '\0'
+		++retlen;//accommodate for terminating '\0'
 	}while (retlen > length);
 
 	std::string sql(pNative);

Data/ODBC/src/Preparator.cpp

@@ -158,7 +158,7 @@ std::size_t Preparator::maxDataSize(std::size_t pos) const
 		ODBCMetaColumn mc(_rStmt, pos);
 		sz = mc.length();
 
-		// accomodate for terminating zero (non-bulk only!)
+		// accommodate for terminating zero (non-bulk only!)
 		MetaColumn::ColumnDataType type = mc.type();
 		if (!isBulk() && ((ODBCMetaColumn::FDT_WSTRING == type) || (ODBCMetaColumn::FDT_STRING == type))) ++sz;
 	}

Data/ODBC/testsuite/src/ODBCAccessTest.cpp

@@ -195,7 +195,7 @@ bool ODBCAccessTest::init(const std::string& driver, const std::string& dsn)
 		return false;
 	}
 
-	//N.B. Access driver does not suport check for connection.
+	//N.B. Access driver does not support check for connection.
 	std::cout << "*** Connected to [" << driver << "] test database." << std::endl;
 
 	return true;

Data/ODBC/testsuite/src/ODBCPostgreSQLTest.h

@@ -80,9 +80,9 @@ class ODBCPostgreSQLTest: public ODBCTest
 		/// Alternative is direct database configuration for PL/pgSQL usage.
 
 	static const std::string _libDir;
-		/// Varible determining the location of the library directory
+		/// Variable determining the location of the library directory
 		/// on the database installation system.
-		/// Used to enable PLpgSQL language programmaticaly when
+		/// Used to enable PLpgSQL language programmatically when
 		/// it is not enabled.
 
 	static SessionPtr  _pSession;

Data/SQLite/include/Poco/Data/SQLite/Notifier.h

@@ -46,7 +46,7 @@ class SQLite_API Notifier
 	/// 
 	/// There can be only one set of callbacks per session (i.e. registering a new
 	/// callback automatically unregisters the previous one). All callbacks are 
-	/// registered and enabled at Notifier contruction time and can be disabled
+	/// registered and enabled at Notifier construction time and can be disabled
 	/// at a later point time.
 {
 public:
@@ -119,9 +119,9 @@ class SQLite_API Notifier
 		/// and triggers the event.
 
 	static int sqliteCommitCallbackFn(void* pVal);
-		/// Commit callback event dispatcher. If an exception occurs, it is catched inside this function,
+		/// Commit callback event dispatcher. If an exception occurs, it is caught inside this function,
 		/// non-zero value is returned, which causes SQLite engine to turn commit into a rollback.
-		/// Therefore, callers should check for return value - if it is zero, callback completed succesfuly
+		/// Therefore, callers should check for return value - if it is zero, callback completed successfuly
 		/// and transaction was committed.
 
 	static void sqliteRollbackCallbackFn(void* pVal);

Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h

@@ -78,8 +78,8 @@ class SQLite_API SQLiteStatementImpl: public Poco::Data::StatementImpl
 
 	void compileImpl();
 		/// Compiles the statement, doesn't bind yet.
-		/// Returns true if the statement was succesfully compiled.
-		/// The way SQLite handles batches of statmeents is by compiling
+		/// Returns true if the statement was successfully compiled.
+		/// The way SQLite handles batches of statements is by compiling
 		/// one at a time and returning a pointer to the next one.
 		/// The remainder of the statement is kept in a string
 		/// buffer pointed to by _pLeftover member.

Data/SQLite/include/Poco/Data/SQLite/Utility.h

@@ -60,10 +60,10 @@ class SQLite_API Utility
 		/// Returns native DB handle.
 
 	static std::string lastError(sqlite3* pDb);
-		/// Retreives the last error code from sqlite and converts it to a string.
+		/// Retrieves the last error code from sqlite and converts it to a string.
 
 	static std::string lastError(const Session& session);
-		/// Retreives the last error code from sqlite and converts it to a string.
+		/// Retrieves the last error code from sqlite and converts it to a string.
 
 	static void throwException(int rc, const std::string& addErrMsg = std::string());
 		/// Throws for an error code the appropriate exception
@@ -75,37 +75,37 @@ class SQLite_API Utility
 		/// Loads the contents of a database file on disk into an opened
 		/// database in memory.
 		/// 
-		/// Returns true if succesful.
+		/// Returns true if successful.
 
 	static bool fileToMemory(const Session& session, const std::string& fileName);
 		/// Loads the contents of a database file on disk into an opened
 		/// database in memory.
 		/// 
-		/// Returns true if succesful.
+		/// Returns true if successful.
 
 	static bool memoryToFile(const std::string& fileName, sqlite3* pInMemory);
 		/// Saves the contents of an opened database in memory to the
 		/// database on disk.
 		/// 
-		/// Returns true if succesful.
+		/// Returns true if successful.
 
 	static bool memoryToFile(const std::string& fileName, const Session& session);
 		/// Saves the contents of an opened database in memory to the
 		/// database on disk.
 		/// 
-		/// Returns true if succesful.
+		/// Returns true if successful.
 
 	static bool isThreadSafe();
 		/// Returns true if SQLite was compiled in multi-thread or serialized mode.
 		/// See http://www.sqlite.org/c3ref/threadsafe.html for details.
 		/// 
-		/// Returns true if succesful
+		/// Returns true if successful
 
 	static bool setThreadMode(int mode);
 		/// Sets the threading mode to single, multi or serialized.
 		/// See http://www.sqlite.org/threadsafe.html for details.
 		/// 
-		/// Returns true if succesful
+		/// Returns true if successful
 
 	static int getThreadMode();
 		/// Returns the thread mode.

Data/include/Poco/Data/AbstractBinder.h

@@ -172,7 +172,7 @@ class Data_API AbstractBinder
 		/// Binds a long.
 
 	virtual void bind(std::size_t pos, const unsigned long& val, Direction dir = PD_IN) = 0;
-		/// Binds an unsiged long.
+		/// Binds an unsigned long.
 
 	virtual void bind(std::size_t pos, const std::vector<long>& val, Direction dir = PD_IN);
 		/// Binds a long vector.

Data/include/Poco/Data/AbstractExtraction.h

@@ -140,15 +140,15 @@ class Data_API AbstractExtraction
 	bool isValueNull(const std::string& str, bool deflt);
 		/// Overload for const reference to std::string.
 		///
-		/// Returns true when folowing conditions are met:
+		/// Returns true when following conditions are met:
 		///
 		/// - string is empty 
 		/// - getEmptyStringIsNull() returns true
 
 	bool isValueNull(const Poco::UTF16String& str, bool deflt);
 		/// Overload for const reference to UTF16String.
 		///
-		/// Returns true when folowing conditions are met:
+		/// Returns true when following conditions are met:
 		///
 		/// - string is empty 
 		/// - getEmptyStringIsNull() returns true