浏览代码

Updated upb to latest version (C89).

Since this version of upb supports C89, all of the
extra compiler flags are no longer required.
Josh Haberman 10 年之前
父节点
当前提交
e8ed021ee7
共有 4 个文件被更改,包括 575 次插入567 次删除
  1. 1 3
      ruby/ext/google/protobuf_c/extconf.rb
  2. 1 1
      ruby/ext/google/protobuf_c/map.c
  3. 200 278
      ruby/ext/google/protobuf_c/upb.c
  4. 373 285
      ruby/ext/google/protobuf_c/upb.h

+ 1 - 3
ruby/ext/google/protobuf_c/extconf.rb

@@ -2,9 +2,7 @@
 
 
 require 'mkmf'
 require 'mkmf'
 
 
-$CFLAGS += " -O3 -std=c99 -Wno-unused-function " +
-           "-Wno-declaration-after-statement -Wno-unused-variable " +
-           "-Wno-sign-compare -DNDEBUG "
+$CFLAGS += " -O3 -DNDEBUG"
 
 
 $objs = ["protobuf.o", "defs.o", "storage.o", "message.o",
 $objs = ["protobuf.o", "defs.o", "storage.o", "message.o",
          "repeated_field.o", "map.o", "encode_decode.o", "upb.o"]
          "repeated_field.o", "map.o", "encode_decode.o", "upb.o"]

+ 1 - 1
ruby/ext/google/protobuf_c/map.c

@@ -120,7 +120,7 @@ static VALUE table_key_to_ruby(Map* self, const char* buf, size_t length) {
 }
 }
 
 
 static void* value_memory(upb_value* v) {
 static void* value_memory(upb_value* v) {
-  return (void*)(&v->val.uint64);
+  return (void*)(&v->val);
 }
 }
 
 
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------

文件差异内容过多而无法显示
+ 200 - 278
ruby/ext/google/protobuf_c/upb.c


文件差异内容过多而无法显示
+ 373 - 285
ruby/ext/google/protobuf_c/upb.h


部分文件因为文件数量过多而无法显示