Merge remote-tracking branch 'pocoproject/develop' into develop

Data/MySQL/Makefile

@@ -8,8 +8,18 @@
 
 include $(POCO_BASE)/build/rules/global
 
-SYSLIBS += -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX) -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -lmysqlclient
-INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql/ -I/usr/mysql/include/mysql -I/usr/local/mysql/include
+MYSQL_LIBDIR ?= /usr/local/lib$(LIB64SUFFIX)/mysql \
+		/usr/lib$(LIB64SUFFIX)/mysql \
+		/usr/mysql/lib$(LIB64SUFFIX) \
+		/usr/mysql/lib$(LIB64SUFFIX)/mysql \
+		/usr/local/mysql/lib$(LIB64SUFFIX)
+MYSQL_INCDIR ?= /usr/local/include/mysql/ \
+		/usr/include/mysql/ \
+		/usr/mysql/include/mysql \
+		/usr/local/mysql/include
+
+SYSLIBS += $(foreach dir,$(MYSQL_LIBDIR),-L$(dir)) -lmysqlclient
+INCLUDE += $(foreach dir,$(MYSQL_INCDIR),-I$(dir))
 SYSFLAGS += -DTHREADSAFE -DNO_TCL
 
 objects = Binder Extractor SessionImpl Connector \

Foundation/src/Error.cpp

@@ -69,7 +69,7 @@ namespace Poco {
 		   without -D_GNU_SOURCE is needed, otherwise the GNU version is
 		   preferred.
 		*/
-#if defined _GNU_SOURCE && !POCO_ANDROID
+#if (defined __GLIBC__ || defined __UCLIBC__) && defined _GNU_SOURCE && !POCO_ANDROID
 		char errmsg[256] = "";
 		return std::string(strerror_r(errorCode, errmsg, 256));
 #elif (_XOPEN_SOURCE >= 600) || POCO_ANDROID

XML/testsuite/src/AttributesImplTest.cpp

@@ -19,7 +19,7 @@
 using Poco::XML::AttributesImpl;
 
 
-AttributesImplTest::AttributesImplTest(const std::string& name): CppUnit::TestCase(name)
+AttributesImplTest::AttributesImplTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 

XML/testsuite/src/ChildNodesTest.cpp

@@ -26,7 +26,7 @@ using Poco::XML::Node;
 using Poco::XML::AutoPtr;
 
 
-ChildNodesTest::ChildNodesTest(const std::string& name): CppUnit::TestCase(name)
+ChildNodesTest::ChildNodesTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 

XML/testsuite/src/DocumentTest.cpp

@@ -31,7 +31,7 @@ using Poco::XML::XMLString;
 using Poco::XML::DOMException;
 
 
-DocumentTest::DocumentTest(const std::string& name): CppUnit::TestCase(name)
+DocumentTest::DocumentTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 

XML/testsuite/src/DocumentTypeTest.cpp

@@ -31,7 +31,7 @@ using Poco::XML::NamedNodeMap;
 using Poco::XML::AutoPtr;
 
 
-DocumentTypeTest::DocumentTypeTest(const std::string& name): CppUnit::TestCase(name)
+DocumentTypeTest::DocumentTypeTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 

XML/testsuite/src/ElementTest.cpp

@@ -33,7 +33,7 @@ using Poco::XML::AutoPtr;
 using Poco::XML::XMLString;
 
 
-ElementTest::ElementTest(const std::string& name): CppUnit::TestCase(name)
+ElementTest::ElementTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 

XML/testsuite/src/EventTest.cpp

@@ -133,7 +133,7 @@ private:
 XMLString TestEventListener::_log;
 
 
-EventTest::EventTest(const std::string& name): CppUnit::TestCase(name)
+EventTest::EventTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 

XML/testsuite/src/NamePoolTest.cpp

@@ -23,7 +23,7 @@ using Poco::XML::Name;
 using Poco::XML::AutoPtr;
 
 
-NamePoolTest::NamePoolTest(const std::string& name): CppUnit::TestCase(name)
+NamePoolTest::NamePoolTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
@@ -37,16 +37,16 @@ void NamePoolTest::testNamePool()
 {
 	AutoPtr<NamePool> pool = new NamePool;
 	const Name* pName = 0;
-	Name name("pre:local", "http://www.appinf.com");
+	Name xmlName("pre:local", "http://www.appinf.com");
 	
-	pName = &pool->insert(name);
+	pName = &pool->insert(xmlName);
 	const Name* pName2 = &pool->insert("pre:local", "http://www.appinf.com", "local");
 	assert (pName == pName2);
 	
 	pName2 = &pool->insert("pre:local2", "http://www.appinf.com", "local2");
 	assert (pName2 != pName);
 	
-	pName2 = &pool->insert(name);
+	pName2 = &pool->insert(xmlName);
 	assert (pName2 == pName);
 	
 	pName2 = &pool->insert(*pName);

XML/testsuite/src/NameTest.cpp

@@ -19,7 +19,7 @@
 using Poco::XML::Name;
 
 
-NameTest::NameTest(const std::string& name): CppUnit::TestCase(name)
+NameTest::NameTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
@@ -81,18 +81,18 @@ void NameTest::testPrefix()
 void NameTest::testName()
 {
 	std::string qname = "name";
-	Name name(qname);
-	assert (name.qname() == "name");
-	assert (name.prefix().empty());
-	assert (name.namespaceURI().empty());
-	assert (name.localName().empty());
+	Name xmlName(qname);
+	assert (xmlName.qname() == "name");
+	assert (xmlName.prefix().empty());
+	assert (xmlName.namespaceURI().empty());
+	assert (xmlName.localName().empty());
 
 	qname.clear();
-	name.assign(qname, "http://www.appinf.com/", "local");
-	assert (name.qname().empty());
-	assert (name.prefix().empty());
-	assert (name.namespaceURI() == "http://www.appinf.com/");
-	assert (name.localName() == "local");
+	xmlName.assign(qname, "http://www.appinf.com/", "local");
+	assert (xmlName.qname().empty());
+	assert (xmlName.prefix().empty());
+	assert (xmlName.namespaceURI() == "http://www.appinf.com/");
+	assert (xmlName.localName() == "local");
 
 	Name name2("pre:local", "http://www.appinf.com/");
 	assert (name2.qname() == "pre:local");

XML/testsuite/src/NamespaceSupportTest.cpp

@@ -19,7 +19,7 @@
 using Poco::XML::NamespaceSupport;
 
 
-NamespaceSupportTest::NamespaceSupportTest(const std::string& name): CppUnit::TestCase(name)
+NamespaceSupportTest::NamespaceSupportTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 

XML/testsuite/src/NodeAppenderTest.cpp

@@ -28,7 +28,7 @@ using Poco::XML::AutoPtr;
 using Poco::XML::XMLString;
 
 
-NodeAppenderTest::NodeAppenderTest(const std::string& name): CppUnit::TestCase(name)
+NodeAppenderTest::NodeAppenderTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 

XML/testsuite/src/NodeIteratorTest.cpp

@@ -46,7 +46,7 @@ namespace
 }
 
 
-NodeIteratorTest::NodeIteratorTest(const std::string& name): CppUnit::TestCase(name)
+NodeIteratorTest::NodeIteratorTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 

XML/testsuite/src/NodeTest.cpp

@@ -26,7 +26,7 @@ using Poco::XML::Node;
 using Poco::XML::AutoPtr;
 
 
-NodeTest::NodeTest(const std::string& name): CppUnit::TestCase(name)
+NodeTest::NodeTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 

XML/testsuite/src/ParserWriterTest.cpp

@@ -32,7 +32,7 @@ using Poco::XML::AutoPtr;
 using Poco::XML::InputSource;
 
 
-ParserWriterTest::ParserWriterTest(const std::string& name): CppUnit::TestCase(name)
+ParserWriterTest::ParserWriterTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 

XML/testsuite/src/SAXParserTest.cpp

@@ -64,7 +64,7 @@ public:
 };
 
 
-SAXParserTest::SAXParserTest(const std::string& name): CppUnit::TestCase(name)
+SAXParserTest::SAXParserTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 

XML/testsuite/src/TextTest.cpp

@@ -28,7 +28,7 @@ using Poco::XML::AutoPtr;
 using Poco::XML::XMLString;
 
 
-TextTest::TextTest(const std::string& name): CppUnit::TestCase(name)
+TextTest::TextTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 

XML/testsuite/src/TreeWalkerTest.cpp

@@ -57,7 +57,7 @@ namespace
 }
 
 
-TreeWalkerTest::TreeWalkerTest(const std::string& name): CppUnit::TestCase(name)
+TreeWalkerTest::TreeWalkerTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 

XML/testsuite/src/XMLStreamParserTest.cpp

@@ -23,8 +23,8 @@
 using namespace Poco::XML;
 
 
-XMLStreamParserTest::XMLStreamParserTest(const std::string& name):
-	CppUnit::TestCase(name)
+XMLStreamParserTest::XMLStreamParserTest(const std::string& rName):
+	CppUnit::TestCase(rName)
 {
 }
 

XML/testsuite/src/XMLWriterTest.cpp

@@ -23,7 +23,7 @@ using Poco::XML::XMLWriter;
 using Poco::XML::AttributesImpl;
 
 
-XMLWriterTest::XMLWriterTest(const std::string& name): CppUnit::TestCase(name)
+XMLWriterTest::XMLWriterTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }