Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-26 01:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

AxisCamera constructor: add StringRef overload (#1458)

Browse Source 
This avoids a conversion ambiguity when StringRef is passed.
This commit is contained in:
Peter Johnson
2018-11-30 22:35:56 -08:00
committed by GitHub
parent 5551981b3f
commit 73de3364b7
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cscore/src/main/native/include/cscore_oo.h
View File

@@ -582,6 +582,15 @@ class AxisCamera : public HttpCamera {
*/
AxisCamera(const wpi::Twine& name, const std::string& host);
/**
* Create a source for an Axis IP camera.
*
* @param name Source name (arbitrary unique identifier)
* @param host Camera host IP or DNS name (e.g. "10.x.y.11")
* @param kind Camera kind (e.g. kAxis)
*/
AxisCamera(const wpi::Twine& name, wpi::StringRef host);
/**
* Create a source for an Axis IP camera.
*

3
cscore/src/main/native/include/cscore_oo.inl
View File

@@ -361,6 +361,9 @@ inline AxisCamera::AxisCamera(const wpi::Twine& name, const char* host)
inline AxisCamera::AxisCamera(const wpi::Twine& name, const std::string& host)
: HttpCamera(name, HostToUrl(wpi::Twine{host}), kAxis) {}
inline AxisCamera::AxisCamera(const wpi::Twine& name, wpi::StringRef host)
: HttpCamera(name, HostToUrl(host), kAxis) {}
inline AxisCamera::AxisCamera(const wpi::Twine& name,
wpi::ArrayRef<std::string> hosts)
: HttpCamera(name, HostToUrl(hosts), kAxis) {}