Prechádzať zdrojové kódy

Sync changes to golden output that was somehow missed in 387ab631eb.

R=r, r2
CC=golang-dev
http://codereview.appspot.com/4041041
David Symonds 15 rokov pred
rodič
commit
2a0a764d6a

+ 5 - 1
compiler/testdata/test.pb.go.golden

@@ -4,11 +4,13 @@
 package my_test
 package my_test
 
 
 import proto "goprotobuf.googlecode.com/hg/proto"
 import proto "goprotobuf.googlecode.com/hg/proto"
+import "math"
 import "os"
 import "os"
 import imp "imp.pb"
 import imp "imp.pb"
 
 
-// Reference proto & os imports to suppress error if it's not otherwise used.
+// Reference proto, math & os imports to suppress error if they are not otherwise used.
 var _ = proto.GetString
 var _ = proto.GetString
+var _ = math.Inf
 var _ os.Error
 var _ os.Error
 
 
 type HatType int32
 type HatType int32
@@ -95,12 +97,14 @@ type Request struct {
 	Hue	*Request_Color	"PB(varint,3,opt,name=hue,enum=my_test.Request_Color)"
 	Hue	*Request_Color	"PB(varint,3,opt,name=hue,enum=my_test.Request_Color)"
 	Hat	*HatType	"PB(varint,4,opt,name=hat,enum=my_test.HatType,def=1)"
 	Hat	*HatType	"PB(varint,4,opt,name=hat,enum=my_test.HatType,def=1)"
 	Owner	*imp.ImportedMessage_Owner	"PB(varint,6,opt,name=owner,enum=imp.ImportedMessage_Owner)"
 	Owner	*imp.ImportedMessage_Owner	"PB(varint,6,opt,name=owner,enum=imp.ImportedMessage_Owner)"
+	Deadline	*float32	"PB(fixed32,7,opt,name=deadline,def=inf)"
 	XXX_unrecognized	[]byte
 	XXX_unrecognized	[]byte
 }
 }
 func (this *Request) Reset() {
 func (this *Request) Reset() {
 	*this = Request{}
 	*this = Request{}
 }
 }
 const Default_Request_Hat HatType = HatType_FEDORA
 const Default_Request_Hat HatType = HatType_FEDORA
+var Default_Request_Deadline float32 = float32(math.Inf(1))
 
 
 type Reply struct {
 type Reply struct {
 	Found	[]*Reply_Entry	"PB(bytes,1,rep,name=found)"
 	Found	[]*Reply_Entry	"PB(bytes,1,rep,name=found)"

+ 3 - 1
proto/testdata/test.pb.go

@@ -4,10 +4,12 @@
 package test_proto
 package test_proto
 
 
 import proto "goprotobuf.googlecode.com/hg/proto"
 import proto "goprotobuf.googlecode.com/hg/proto"
+import "math"
 import "os"
 import "os"
 
 
-// Reference proto & os imports to suppress error if it's not otherwise used.
+// Reference proto, math & os imports to suppress error if they are not otherwise used.
 var _ = proto.GetString
 var _ = proto.GetString
+var _ = math.Inf
 var _ os.Error
 var _ os.Error
 
 
 type FOO int32
 type FOO int32