summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@theqtcompany.com>2016-06-16 15:10:50 +0200
committerAlex Blasche <alexander.blasche@theqtcompany.com>2016-06-16 13:21:53 +0000
commit7d4f6cab9fc5c8a8061b13e9b15bacf17e7e7b4c (patch)
treeda53a87ea015d6bdff963cfe06a9d8ff11bfb5eb
parentc6ca6517ffaaf10d2e461c76dfaae5a9665f7d56 (diff)
Fix build error on Linux using clang/trunk
It seems clang trunk cannot distinguish std::bind from bind() in sys/socket.h. There is no apparent std namespace usage but clang still complains. This patch resolves the disambiguity. Task-number: QTBUG-53683 Change-Id: Ib4bbe4a4cdf679fa3314abba5970968d7d8a9857 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
-rw-r--r--src/bluetooth/lecmaccalculator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bluetooth/lecmaccalculator.cpp b/src/bluetooth/lecmaccalculator.cpp
index 1cda9576..47fef7df 100644
--- a/src/bluetooth/lecmaccalculator.cpp
+++ b/src/bluetooth/lecmaccalculator.cpp
@@ -72,7 +72,7 @@ LeCmacCalculator::LeCmacCalculator()
sa.salg_family = AF_ALG;
strcpy(reinterpret_cast<char *>(sa.salg_type), "hash");
strcpy(reinterpret_cast<char *>(sa.salg_name), "cmac(aes)");
- if (bind(m_baseSocket, reinterpret_cast<sockaddr *>(&sa), sizeof sa) == -1) {
+ if (::bind(m_baseSocket, reinterpret_cast<sockaddr *>(&sa), sizeof sa) == -1) {
qCWarning(QT_BT_BLUEZ) << "bind() failed for crypto socket:" << strerror(errno);
return;
}