Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-11-08 14:29:17 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-11-18 08:49:39 (GMT) |
| commit | 43479ef719ea8fc6abbf654730b47c4583140508 (patch) | |
| tree | c0a05a837b8988c0875fedb6161c08f3dcb2ffb0 /Swiften/Component | |
| parent | c82f95fd431e702137d5f2e3dda4cf0ae424e837 (diff) | |
| download | swift-43479ef719ea8fc6abbf654730b47c4583140508.zip swift-43479ef719ea8fc6abbf654730b47c4583140508.tar.bz2 | |
Improve string to HostAddress conversion API
Previously HostAddress had a constructor which allowed
initialisation via a std::string. This initialisation can
fail and this is heavily used for checking whether a string
is a valid IP address.
This constructor is removed in this commit and replaced by
a static method HostAddress::fromString, taking a string and
returning an optional HostAddress. This clearly communicates
that the conversion can fail.
Test-Information:
./scons test=all passes on macOS 10.12.1.
Change-Id: Idaafee6f84010ce541c55f267ac77ad6ac8f02b4
Diffstat (limited to 'Swiften/Component')
| -rw-r--r-- | Swiften/Component/UnitTest/ComponentConnectorTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Component/UnitTest/ComponentConnectorTest.cpp b/Swiften/Component/UnitTest/ComponentConnectorTest.cpp index 3515a0a..3b4fa83 100644 --- a/Swiften/Component/UnitTest/ComponentConnectorTest.cpp +++ b/Swiften/Component/UnitTest/ComponentConnectorTest.cpp @@ -33,8 +33,8 @@ class ComponentConnectorTest : public CppUnit::TestFixture { public: void setUp() { - host1 = HostAddress("1.1.1.1"); - host2 = HostAddress("2.2.2.2"); + host1 = HostAddress::fromString("1.1.1.1").get(); + host2 = HostAddress::fromString("2.2.2.2").get(); eventLoop = new DummyEventLoop(); resolver = new StaticDomainNameResolver(eventLoop); connectionFactory = new MockConnectionFactory(eventLoop); |