diff options
| author | Giuliano Belinassi <giuliano.belinassi@usp.br> | 2020-08-22 17:43:43 -0300 |
|---|---|---|
| committer | Giuliano Belinassi <giuliano.belinassi@usp.br> | 2020-08-22 17:43:43 -0300 |
| commit | a926878ddbd5a98b272c22171ce58663fc04c3e0 (patch) | |
| tree | 86af256e5d9a9c06263c00adc90e5fe348008c43 /libgo/go/net/ip.go | |
| parent | 542730f087133690b47e036dfd43eb0db8a650ce (diff) | |
| parent | 07cbaed8ba7d1b6e4ab3a9f44175502a4e1ecdb1 (diff) | |
| download | gcc-devel/autopar_devel.zip gcc-devel/autopar_devel.tar.gz gcc-devel/autopar_devel.tar.bz2 | |
Merge branch 'autopar_rebase2' into autopar_develdevel/autopar_devel
Quickly commit changes in the rebase branch.
Diffstat (limited to 'libgo/go/net/ip.go')
| -rw-r--r-- | libgo/go/net/ip.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libgo/go/net/ip.go b/libgo/go/net/ip.go index 9d1223e..c00fe8e 100644 --- a/libgo/go/net/ip.go +++ b/libgo/go/net/ip.go @@ -671,8 +671,8 @@ func parseIPv6(s string) (ip IP) { } // ParseIP parses s as an IP address, returning the result. -// The string s can be in dotted decimal ("192.0.2.1") -// or IPv6 ("2001:db8::68") form. +// The string s can be in IPv4 dotted decimal ("192.0.2.1"), IPv6 +// ("2001:db8::68"), or IPv4-mapped IPv6 ("::ffff:192.0.2.1") form. // If s is not a valid textual representation of an IP address, // ParseIP returns nil. func ParseIP(s string) IP { |