Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
3a7ae270
Commit
3a7ae270
authored
Apr 10, 2015
by
Adrien Béraud
Committed by
Alexandre Lision
Apr 10, 2015
Browse files
Options
Downloads
Patches
Plain Diff
build: fix compilation with clang
Refs #69759 Change-Id: I31cc7ab37a756f8750d84829e187ca81aa159701
parent
f7157454
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/rational.h
+2
-0
2 additions, 0 deletions
src/rational.h
src/ringdht/ringaccount.cpp
+1
-1
1 addition, 1 deletion
src/ringdht/ringaccount.cpp
src/ringdht/ringaccount.h
+1
-1
1 addition, 1 deletion
src/ringdht/ringaccount.h
src/sip/sipaccountbase.cpp
+1
-0
1 addition, 0 deletions
src/sip/sipaccountbase.cpp
with
5 additions
and
2 deletions
src/rational.h
+
2
−
0
View file @
3a7ae270
...
@@ -31,6 +31,8 @@
...
@@ -31,6 +31,8 @@
#pragma once
#pragma once
#include
<cstdlib>
// std::abs
namespace
ring
{
namespace
ring
{
/**
/**
...
...
This diff is collapsed.
Click to expand it.
src/ringdht/ringaccount.cpp
+
1
−
1
View file @
3a7ae270
...
@@ -81,7 +81,7 @@ static constexpr int ICE_INIT_TIMEOUT {5};
...
@@ -81,7 +81,7 @@ static constexpr int ICE_INIT_TIMEOUT {5};
static
constexpr
int
ICE_NEGOTIATION_TIMEOUT
{
60
};
static
constexpr
int
ICE_NEGOTIATION_TIMEOUT
{
60
};
constexpr
const
char
*
const
RingAccount
::
ACCOUNT_TYPE
;
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 */
)
RingAccount
::
RingAccount
(
const
std
::
string
&
accountID
,
bool
/* presenceEnabled */
)
:
SIPAccountBase
(
accountID
),
via_addr_
()
:
SIPAccountBase
(
accountID
),
via_addr_
()
...
...
This diff is collapsed.
Click to expand it.
src/ringdht/ringaccount.h
+
1
−
1
View file @
3a7ae270
...
@@ -79,7 +79,7 @@ class RingAccount : public SIPAccountBase {
...
@@ -79,7 +79,7 @@ class RingAccount : public SIPAccountBase {
constexpr
static
const
char
*
const
ACCOUNT_TYPE
=
"RING"
;
constexpr
static
const
char
*
const
ACCOUNT_TYPE
=
"RING"
;
constexpr
static
const
in_port_t
DHT_DEFAULT_PORT
=
4222
;
constexpr
static
const
in_port_t
DHT_DEFAULT_PORT
=
4222
;
constexpr
static
const
char
*
const
DHT_DEFAULT_BOOTSTRAP
=
"bootstrap.ring.cx"
;
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
{
const
char
*
getAccountType
()
const
{
return
ACCOUNT_TYPE
;
return
ACCOUNT_TYPE
;
...
...
This diff is collapsed.
Click to expand it.
src/sip/sipaccountbase.cpp
+
1
−
0
View file @
3a7ae270
...
@@ -276,6 +276,7 @@ uint16_t
...
@@ -276,6 +276,7 @@ uint16_t
SIPAccountBase
::
acquirePort
(
uint16_t
port
)
SIPAccountBase
::
acquirePort
(
uint16_t
port
)
{
{
getPortsReservation
()[
port
/
2
]
=
true
;
getPortsReservation
()[
port
/
2
]
=
true
;
return
port
;
}
}
void
void
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment