Merge pull request #2229 from geky/nsapi-fix-iar

sg- · web-flow · commit fcd03f285dee · 2016-07-22T17:22:56.000-05:00
[nsapi] Fixed iar compilation issue with value initializer
diff --git a/features/net/network-socket/SocketAddress.cpp b/features/net/network-socket/SocketAddress.cpp
@@ -182,7 +182,7 @@ void SocketAddress::set_ip_address(const char *addr)
         _addr.version = NSAPI_IPv6;
         ipv6_from_address(_addr.bytes, addr);
     } else {
-        _addr = (nsapi_addr_t){};
+        _addr = nsapi_addr_t();
     }
 }
 
@@ -275,7 +275,7 @@ void SocketAddress::_SocketAddress(NetworkStack *iface, const char *host, uint16
         // DNS lookup
         int err = iface->gethostbyname(this, host);
         if (err) {
-            _addr = (nsapi_addr_t){};
+            _addr = nsapi_addr_t();
             _port = 0;
         }
     }
diff --git a/features/net/network-socket/SocketAddress.h b/features/net/network-socket/SocketAddress.h
@@ -53,7 +53,7 @@ class SocketAddress {
      *  @param addr     Raw IP address
      *  @param port     Optional 16-bit port
      */
-    SocketAddress(nsapi_addr_t addr = (nsapi_addr_t){}, uint16_t port = 0);
+    SocketAddress(nsapi_addr_t addr = nsapi_addr_t(), uint16_t port = 0);
 
     /** Create a SocketAddress from an IP address and port
      *

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ void SocketAddress::set_ip_address(const char *addr)`
`182`	`182`	`_addr.version = NSAPI_IPv6;`
`183`	`183`	`ipv6_from_address(_addr.bytes, addr);`
`184`	`184`	`} else {`
`185`		`- _addr = (nsapi_addr_t){};`
	`185`	`+ _addr = nsapi_addr_t();`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`
`@@ -275,7 +275,7 @@ void SocketAddress::_SocketAddress(NetworkStack iface, const char host, uint16`
`275`	`275`	`// DNS lookup`
`276`	`276`	`int err = iface->gethostbyname(this, host);`
`277`	`277`	`if (err) {`
`278`		`- _addr = (nsapi_addr_t){};`
	`278`	`+ _addr = nsapi_addr_t();`
`279`	`279`	`_port = 0;`
`280`	`280`	`}`
`281`	`281`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ class SocketAddress {`
`53`	`53`	`* @param addr Raw IP address`
`54`	`54`	`* @param port Optional 16-bit port`
`55`	`55`	`*/`
`56`		`- SocketAddress(nsapi_addr_t addr = (nsapi_addr_t){}, uint16_t port = 0);`
	`56`	`+ SocketAddress(nsapi_addr_t addr = nsapi_addr_t(), uint16_t port = 0);`
`57`	`57`
`58`	`58`	`/** Create a SocketAddress from an IP address and port`
`59`	`59`	`*`