From 3a7ae270433e2f68f9c5bd8b44c09d92640535e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Fri, 10 Apr 2015 10:59:43 -0400
Subject: [PATCH] build: fix compilation with clang
Refs #69759
Change-Id: I31cc7ab37a756f8750d84829e187ca81aa159701
---
src/rational.h | 2 ++
src/ringdht/ringaccount.cpp | 2 +-
src/ringdht/ringaccount.h | 2 +-
src/sip/sipaccountbase.cpp | 1 +
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/rational.h b/src/rational.h
index 45fdefe066..681f8fc4f4 100644
--- a/src/rational.h
+++ b/src/rational.h
@@ -31,6 +31,8 @@
#pragma once
+#include <cstdlib> // std::abs
+
namespace ring {
/**
diff --git a/src/ringdht/ringaccount.cpp b/src/ringdht/ringaccount.cpp
index 299a1f6ad4..2f0518facf 100644
--- a/src/ringdht/ringaccount.cpp
+++ b/src/ringdht/ringaccount.cpp
@@ -81,7 +81,7 @@ static constexpr int ICE_INIT_TIMEOUT {5};
static constexpr int ICE_NEGOTIATION_TIMEOUT {60};
constexpr const char * const RingAccount::ACCOUNT_TYPE;
-constexpr const std::pair<uint16_t, uint16_t> RingAccount::DHT_PORT_RANGE;
+/* constexpr */ const std::pair<uint16_t, uint16_t> RingAccount::DHT_PORT_RANGE {4000, 8888};
RingAccount::RingAccount(const std::string& accountID, bool /* presenceEnabled */)
: SIPAccountBase(accountID), via_addr_()
diff --git a/src/ringdht/ringaccount.h b/src/ringdht/ringaccount.h
index 853ee19c42..858a37a9ab 100644
--- a/src/ringdht/ringaccount.h
+++ b/src/ringdht/ringaccount.h
@@ -79,7 +79,7 @@ class RingAccount : public SIPAccountBase {
constexpr static const char * const ACCOUNT_TYPE = "RING";
constexpr static const in_port_t DHT_DEFAULT_PORT = 4222;
constexpr static const char * const DHT_DEFAULT_BOOTSTRAP = "bootstrap.ring.cx";
- constexpr static const std::pair<uint16_t, uint16_t> DHT_PORT_RANGE {4000, 8888};
+ /* constexpr */ static const std::pair<uint16_t, uint16_t> DHT_PORT_RANGE;
const char* getAccountType() const {
return ACCOUNT_TYPE;
diff --git a/src/sip/sipaccountbase.cpp b/src/sip/sipaccountbase.cpp
index 7302913c27..c94874da2e 100644
--- a/src/sip/sipaccountbase.cpp
+++ b/src/sip/sipaccountbase.cpp
@@ -276,6 +276,7 @@ uint16_t
SIPAccountBase::acquirePort(uint16_t port)
{
getPortsReservation()[port / 2] = true;
+ return port;
}
void
--
GitLab