Skip to content

Commit 2e28bfe

Browse files
committed
Merge tag 'refs/tags/sync-piper' into sync-stage
# Conflicts: # conformance/failure_list_js.txt # src/google/protobuf/generated_message_reflection.h
2 parents 4abd80d + ab32afe commit 2e28bfe

7 files changed

Lines changed: 11 additions & 0 deletions

File tree

binary/constants.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
/**
3232
* @fileoverview This file contains constants and typedefs used by
3333
* jspb.BinaryReader and BinaryWriter.
34+
* @suppress {missingRequire} TODO(b/152540451): this shouldn't be needed
3435
*
3536
* @author aappleby@google.com (Austin Appleby)
3637
*/

binary/decoder.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
* intact, you _must_ read them using one of the Hash64 methods, which return
4141
* an 8-character string.
4242
*
43+
* @suppress {missingRequire} TODO(b/152540451): this shouldn't be needed
4344
* @author aappleby@google.com (Austin Appleby)
4445
*/
4546

binary/reader.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
* using the typed jspb code generator, but if you bypass that you'll need
4242
* to keep things in sync by hand.
4343
*
44+
* @suppress {missingRequire} TODO(b/152540451): this shouldn't be needed
4445
* @author aappleby@google.com (Austin Appleby)
4546
*/
4647

binary/utils.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
* @fileoverview This file contains helper code used by jspb.BinaryReader
3333
* and BinaryWriter.
3434
*
35+
* @suppress {missingRequire} TODO(b/152540451): this shouldn't be needed
3536
* @author aappleby@google.com (Austin Appleby)
3637
*/
3738

binary/writer.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
* Major caveat 3 - This class uses typed arrays and must not be used on older
5353
* browsers that do not support them.
5454
*
55+
* @suppress {missingRequire} TODO(b/152540451): this shouldn't be needed
5556
* @author aappleby@google.com (Austin Appleby)
5657
*/
5758

map.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
// Protocol Buffers - Google's data interchange format
23
// Copyright 2008 Google Inc. All rights reserved.
34
// https://developers.google.com/protocol-buffers/
@@ -28,6 +29,10 @@
2829
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2930
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3031

32+
/**
33+
* @fileoverview
34+
* @suppress {missingRequire} TODO(b/152540451): this shouldn't be needed
35+
*/
3136
goog.provide('jspb.Map');
3237

3338
goog.require('goog.asserts');

message.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
/**
3232
* @fileoverview Definition of jspb.Message.
3333
*
34+
* @suppress {missingRequire} TODO(b/152540451): this shouldn't be needed
3435
* @author mwr@google.com (Mark Rawling)
3536
*/
3637

0 commit comments

Comments
 (0)