[Rprotobuf-commits] r882 - in pkg: . inst/unitTests/data

[noreply at r-forge.r-project.org]

Author: murray
Date: 2014-03-24 21:52:51 +0100 (Mon, 24 Mar 2014)
New Revision: 882

Modified:
   pkg/ChangeLog
   pkg/inst/unitTests/data/unittest.proto
Log:
Comment out a dup enum message type that causes problems with
libprotobuf-2.5



Modified: pkg/ChangeLog
===================================================================
--- pkg/ChangeLog	2014-03-24 20:33:35 UTC (rev 881)
+++ pkg/ChangeLog	2014-03-24 20:52:51 UTC (rev 882)
@@ -1,3 +1,10 @@
+2014-03-24  Murray Stokely  <mstokely at google.com>
+
+	* inst/unitTests/data/unittest.proto: Comment out
+	  TestEnumWithDupValue.  This causes problems with the newest
+	  libprotobuf-2.5 which now wants an option to be specified to
+	  enable enum aliasing like this.
+
 2014-03-10  Murray Stokely  <mstokely at google.com>
 
 	* src/DescriptorPoolLookup.cpp (rprotobuf): Import all top-level

Modified: pkg/inst/unitTests/data/unittest.proto
===================================================================
--- pkg/inst/unitTests/data/unittest.proto	2014-03-24 20:33:35 UTC (rev 881)
+++ pkg/inst/unitTests/data/unittest.proto	2014-03-24 20:52:51 UTC (rev 882)
@@ -392,15 +392,16 @@
   optional NestedMessage optional_nested_message = 1;
 }
 
-
+// mstokely commented this out, it breaks with libprotobuf-2.5.
+//
 // Test an enum that has multiple values with the same number.
-enum TestEnumWithDupValue {
-  FOO1 = 1;
-  BAR1 = 2;
-  BAZ = 3;
-  FOO2 = 1;
-  BAR2 = 2;
-}
+// enum TestEnumWithDupValue {
+//  FOO1 = 1;
+//  BAR1 = 2;
+//  BAZ = 3;
+//  FOO2 = 1;
+//  BAR2 = 2;
+//}
 
 // Test an enum with large, unordered values.
 enum TestSparseEnum {