TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 15:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into release.

Browse Source 
Change-Id: Id627ceca5ef60281e024ff80fc1848b3ccb6c14d
This commit is contained in:
Alexey Polyudov
2020-06-04 12:01:48 -07:00
parent 7e19ffbab7 3e7bf3074f
commit 04473705f8
98 changed files with 4136 additions and 718 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpp/core/strategy.cc
+1 -1
View File
@@ -39,7 +39,7 @@ bool Strategy::isValid() const {
return kP2PStar == *this || kP2PCluster == *this || kP2PPointToPoint == *this;
}
string Strategy::getName() const {
std::string Strategy::getName() const {
if (Strategy::kP2PCluster == *this) {
return "P2P_CLUSTER";
} else if (Strategy::kP2PStar == *this) {