aboutsummaryrefslogtreecommitdiffstats
path: root/src/google/protobuf/unittest_nano.proto
diff options
context:
space:
mode:
authorChris Smith <cjs@google.com>2013-07-22 09:00:43 +0100
committerChris Smith <cjs@google.com>2013-07-23 19:13:36 +0100
commit0f2ca89132ab81441f7eb351c7a053a8c8d9d1c3 (patch)
treed30df349a57d0279cb3ff8b8b34459f3ebf22669 /src/google/protobuf/unittest_nano.proto
parenta400007ed570bbcc638c05c59727b3527238ec70 (diff)
downloadexternal_protobuf-0f2ca89132ab81441f7eb351c7a053a8c8d9d1c3.zip
external_protobuf-0f2ca89132ab81441f7eb351c7a053a8c8d9d1c3.tar.gz
external_protobuf-0f2ca89132ab81441f7eb351c7a053a8c8d9d1c3.tar.bz2
Allow NaN/+inf/-inf defaults in micro/nano.
Adds support for default values of NaN, infinity and negative infinity for floats and doubles in both the nano and micro java compiler. Change-Id: Ibc43e5ebb073e51d9a8181f3aa23b72e10015dca
Diffstat (limited to 'src/google/protobuf/unittest_nano.proto')
-rw-r--r--src/google/protobuf/unittest_nano.proto7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/google/protobuf/unittest_nano.proto b/src/google/protobuf/unittest_nano.proto
index e9a0d83..1a6ba26 100644
--- a/src/google/protobuf/unittest_nano.proto
+++ b/src/google/protobuf/unittest_nano.proto
@@ -142,6 +142,13 @@ message TestAllTypesNano {
optional string default_string_nonascii = 76 [default = "dünya"];
optional bytes default_bytes_nonascii = 77 [default = "dünyab"];
+ optional float default_float_inf = 97 [default = inf];
+ optional float default_float_neg_inf = 98 [default = -inf];
+ optional float default_float_nan = 99 [default = nan];
+ optional double default_double_inf = 100 [default = inf];
+ optional double default_double_neg_inf = 101 [default = -inf];
+ optional double default_double_nan = 102 [default = nan];
+
optional NestedEnum default_nested_enum = 81 [default = BAR];
optional ForeignEnumNano default_foreign_enum = 82
[default = FOREIGN_NANO_BAR];