Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 04:44:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://github.com/worklist/hifi into 19377

Browse source
This commit is contained in:
tosh 2013-07-02 00:06:10 +02:00
commit f49e63f842
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
LICENSE Normal file
View file

@ -0,0 +1 @@
All rights reserved. © High Fidelity, Inc. 2013

2
hifi.podspec
View file

@ -22,7 +22,7 @@ Pod::Spec.new do |s|
# Specify the location from where the source should be retrieved.
#
s.source = { :git => "https://github.com/worklist/hifi.git", :commit => "ddc85272b939922c32e6a80f763e6de3cb00ab1a" }
s.source = { :git => "https://github.com/worklist/hifi.git" }
s.platform = :ios
s.ios.deployment_target = "6.0"

2
libraries/shared/src/Agent.cpp
View file

@ -105,7 +105,7 @@ bool Agent::operator==(const Agent& otherAgent) {
return matches(otherAgent._publicSocket, otherAgent._localSocket, otherAgent._type);
}
bool Agent::matches(sockaddr *otherPublicSocket, sockaddr *otherLocalSocket, char otherAgentType) {
bool Agent::matches(sockaddr* otherPublicSocket, sockaddr* otherLocalSocket, char otherAgentType) {
// checks if two agent objects are the same agent (same type + local + public address)
return _type == otherAgentType
&& socketMatch(_publicSocket, otherPublicSocket)