xinb
/
ip2region_private
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the conflicts

This commit is contained in:
lionsoul 2018-07-30 10:39:15 +08:00
parent d239a43fa5 09a6d60620
commit d1c443f934
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
binding/c#/IP2Region/DBSearcher.cs
View File

@ -362,21 +362,21 @@ namespace IP2Region
/// </summary> /// </summary>
public async Task<DataBlock> MemorySearchAsync(string ip) public async Task<DataBlock> MemorySearchAsync(string ip)
{ {
return await Task.FromResult(MemorySearch(ip)); return Task.FromResult(MemorySearch(ip));
} }
/// <summary> /// <summary>
/// Get the region throught the ip address with b-tree search algorithm. /// Get the region throught the ip address with b-tree search algorithm.
/// </summary> /// </summary>
public async Task<DataBlock> BtreeSearchAsync(string ip) public async Task<DataBlock> BtreeSearchAsync(string ip)
{ {
return await Task.FromResult(BtreeSearch(ip)); return Task.FromResult(BtreeSearch(ip));
} }
/// <summary> /// <summary>
/// Get the region throught the ip address with binary search algorithm. /// Get the region throught the ip address with binary search algorithm.
/// </summary> /// </summary>
public async Task<DataBlock> BinarySearchAsync(string ip) public async Task<DataBlock> BinarySearchAsync(string ip)
{ {
return await Task.FromResult(BinarySearch(ip)); return Task.FromResult(BinarySearch(ip));
} }
#endregion #endregion
@ -397,4 +397,4 @@ namespace IP2Region
} }
} }
} }