X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=resource%2Fsrc%2FOCResource.cpp;h=2d11e469a3b1a294105ecf5ece49fd31185df9ab;hb=refs%2Ftags%2Fupstream%2F1.0.1;hp=204b0da17df411ba590cec39ab078469a9888b43;hpb=17c68b2fd1e74586f85e552eeab4e32dc121f8a0;p=platform%2Fupstream%2Fiotivity.git diff --git a/resource/src/OCResource.cpp b/resource/src/OCResource.cpp index 204b0da..2d11e46 100644 --- a/resource/src/OCResource.cpp +++ b/resource/src/OCResource.cpp @@ -28,10 +28,7 @@ namespace OC { static const char COAP[] = "coap://"; static const char COAPS[] = "coaps://"; - -#ifdef TCP_ADAPTER static const char COAP_TCP[] = "coap+tcp://"; -#endif using OC::nil_guard; using OC::result_guard; @@ -127,13 +124,11 @@ void OCResource::setHost(const std::string& host) prefix_len = sizeof(COAPS) - 1; m_devAddr.flags = static_cast(m_devAddr.flags & OC_SECURE); } -#ifdef TCP_ADAPTER else if (host.compare(0, sizeof(COAP_TCP) - 1, COAP_TCP) == 0) { prefix_len = sizeof(COAP_TCP) - 1; m_devAddr.adapter = static_cast(m_devAddr.adapter & OC_ADAPTER_TCP); } -#endif else { throw ResourceInitException(m_uri.empty(), m_resourceTypes.empty(), @@ -417,12 +412,10 @@ std::string OCResource::host() const { ss << COAPS; } -#ifdef TCP_ADAPTER else if (m_devAddr.adapter & OC_ADAPTER_TCP) { ss << COAP_TCP; } -#endif else { ss << COAP;