Commit graph

2265 commits

Author SHA1 Message Date
Josh Haberman
a1daeaba80 Conform to C89/C90 variable declaration rules.
While we are C99 in general, the Ruby build system
for building C extensions enables several flags that
throw warnings for C89/C90 variable ordering rules.
To avoid spewing a million warnings (or trying to
specifically override these warnings with command-line
flags, which would be tricky and possibly fragile)
we conform to Ruby's world of C89/C90.

Change-Id: I0e03e62d95068dfdfde112df0fb16a248a2f32a0
2015-07-10 12:05:14 -07:00
Paul Yang
ab2094de11 Merge pull request #554 from jcanizales/proto-objc-bazel
Add Bazel target for the Objective-C protobuf runtime
2015-07-06 13:05:46 -07:00
Jorge Canizales
d5d7bb3bfb Add Bazel target for protobuf ObjC runtime
Also add WKT headers to the umbrella file, and simplify Podspec with it.
Plus some layout improvements to the BUILD file.
2015-07-06 11:17:39 -07:00
Paul Yang
0a27430bd4 Merge pull request #500 from TeBoring/temp
Implement parsing for proto3 primitive repeated fields.
2015-07-01 14:35:19 -07:00
Feng Xiao
ec7bbc76be Merge pull request #551 from ostrovsky/master
MinGW64+MSYS2 compilation issues
2015-07-01 10:36:30 -07:00
Karol Ostrovsky
ee35402244 MinGW64+MSYS2 compilation issues and portable isnan using MathLimits 2015-07-01 10:09:41 +02:00
Paul Yang
eb162dad5f Merge pull request #458 from xfxyjwf/memory_leak
Delete default UnknownFieldSet when shuting down.
2015-06-30 16:45:22 -07:00
Feng Xiao
c3cb53b8f4 Merge pull request #556 from mgiuca/fix-clang-warning
Fix "sometimes-uninitialized" warning on Windows Clang.
2015-06-30 11:45:41 -07:00
Matt Giuca
43dcbbfec7 Fix "sometimes-uninitialized" warning on Windows Clang. 2015-06-30 17:23:26 +10:00
Jisi Liu
d40a0db202 Merge pull request #540 from pherl/clean-warnings
fix compiler warnings.
2015-06-25 01:37:43 -07:00
Paul Yang
eda912eeb3 Merge pull request #512 from pherl/bazel
Enable tests for bazel build.
2015-06-24 16:14:46 -07:00
Jisi Liu
658e72d8fb fix compiler warnings.
- control reaches end of non-void function.
- remove a deprecated IsMatch.

Change-Id: Ifdeb15879bbcf591c48dc7fda1cd8994bdf87bb3
2015-06-24 14:56:58 -07:00
Jisi Liu
53c306de19 Merge pull request #538 from google/jtattermusch-patch-1
fix typo in cmake/README.md
2015-06-24 14:47:41 -07:00
Jan Tattermusch
60161997c8 fix typo in cmake/README.md 2015-06-24 09:27:23 -07:00
Joshua Haberman
242fdef65a Merge pull request #530 from haberman/updateupb
Update upb to fix two bugs in the Ruby library.
2015-06-23 11:31:02 -07:00
Josh Haberman
fb8ed707a2 Update upb to fix two bugs in the Ruby library.
Fixes:
  https://github.com/google/protobuf/issues/502
  https://github.com/google/protobuf/issues/425
2015-06-22 17:23:55 -07:00
Feng Xiao
d0eb7786a9 Fix appveyor tests. 2015-06-22 15:09:52 -07:00
Paul Yang
d3d66d7976 Merge pull request #503 from thomasvl/add_nonnill_markup
Add nonnull/nullable/null_resettable markup to ObjC library.
2015-06-19 15:58:31 -07:00
Jisi Liu
7a0c431c8f Enable tests for bazel build.
Change-Id: I63ed5fb58a45e098f2fd1fa457a219148de030bd
2015-06-18 16:45:27 -07:00
Jisi Liu
5b3a8e7635 Merge pull request #510 from pherl/bazel
Remove OUTS constants in BUILD
2015-06-18 14:13:56 -07:00
Jisi Liu
94062398dc Remove OUTS constants in BUILD
Induce those from the input proto file names instead to reduce the
lenght of the BUILD file.

Change-Id: I1dda57dedac547f4bd0cc3a7d08fb611d72acd13
2015-06-18 14:06:26 -07:00
Jisi Liu
89834be92e Merge pull request #509 from pherl/update_BUILD
Update BUILD for the recent json util change.
2015-06-18 13:54:47 -07:00
Jisi Liu
af3eafd1b1 Update BUILD for the recent json util change.
Change-Id: I0b5a2c017f5412aaca3a47815671753cdef63165
2015-06-18 13:39:09 -07:00
Jisi Liu
d6286a9f41 Merge pull request #508 from pherl/nanfix
using ::isnan to avoid conflicts with std::isnan for C++11 build.
2015-06-18 13:38:07 -07:00
Jisi Liu
a2b7937777 using ::isnan to avoid conflicts with std::isnan for C++11 build.
Change-Id: I057b44eff04c3b0062a4fd4307ce6e4ca1eb952b
2015-06-18 13:35:24 -07:00
Jisi Liu
e6484d306d Fix distcheck.
Change-Id: I74e2d5958b5e7b15d10e5a6468bca917323b9739
2015-06-18 11:24:07 -07:00
Jisi Liu
1e534d7ac3 Merge pull request #505 from pherl/bazel
Add bazel support for the project
2015-06-18 11:19:34 -07:00
Jisi Liu
e438a51389 Remove redundant include
Change-Id: I62640af99e3c2650a29dc5468ce3deb7b6c7efdf
2015-06-18 10:52:07 -07:00
Jisi Liu
d19604fac5 Add Bazel BUILD for the project.
Change-Id: I5a299d969ff96d7d2f80aadc7e8987d461d24b8f
2015-06-17 17:37:58 -07:00
Jisi Liu
1c42a8b336 Move cmake/update_file_lists.sh preparing for bazel support.
Change-Id: Idecb2e3a5169f7b40d832242c9c10b0eb4325654
2015-06-17 13:31:26 -07:00
Feng Xiao
e9a122eb19 Merge pull request #501 from xfxyjwf/down
Down-integrate from internal code base.
2015-06-17 13:12:11 -07:00
Feng Xiao
818c5eee08 Fix broken builds. 2015-06-17 11:19:46 -07:00
Jisi Liu
b36395b2ba Merge pull request #497 from pherl/config_h
Check HAVE_CONFIG_H before including "config.h"
2015-06-16 19:12:25 -07:00
Jisi Liu
78d470c7a5 Make the code independent of config.h
Now the Build tool needs to define -DHAVE_ZLIB and -DHAVE-PTHREAD rather
than providing a config.h

- Make pbconfig.h a manually written file to handle hash conditions
  according to platform related macros.
- Remove #include "config.h" from source code.
- Changed the configure.ac and Makefile.am to pass down the macros.
- Change cmake to pass down the the macros.

Change-Id: I537249d5df8fdeba189706aec436d1ab1104a4dc
2015-06-16 18:27:36 -07:00
Thomas Van Lenten
8c88957ef3 Add nonnil markup to ObjC library.
Add the clang annotations to the objc library and generated code to help with Swift bridging and compiler checks.
2015-06-16 17:04:50 -04:00
Feng Xiao
e96ff30120 Down-integrate from internal code base.
[ci skip]

Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d
2015-06-15 18:24:01 -07:00
Bo Yang
a269a6d397 Implement parsing for proto3 primitive repeated fields. Previously, for
proto3 primitive repeated fields, packed data cannot be parsed if
definition is unpacked. Neither is the other way.
2015-06-15 17:19:35 -07:00
Feng Xiao
4cbb612299 Merge pull request #499 from xfxyjwf/appveyor
Add a badge for AppVeyor build.
2015-06-15 16:31:31 -07:00
Feng Xiao
4479076bbd Merge pull request #488 from AustinSchuh/ruby_test_fix
Modified FindRubyTestDir to use GOOGLE_THIRD_PARTY_PROTOBUF
2015-06-15 16:31:17 -07:00
Feng Xiao
9c8db515d5 Add a badge for AppVeyor build.
Change-Id: Ic59d78d699af0e5f50377f83c8a7ea9a78074d81
2015-06-15 15:36:09 -07:00
Jisi Liu
6f56b1a691 Merge pull request #498 from pherl/rmconfig
Remove config.h.include which is no longer needed
2015-06-13 23:56:17 -07:00
Jisi Liu
80da6d3727 Remove the file from Makefile.am
Change-Id: I2015df2409aa95401af658b40023c8f9b9d75068
2015-06-13 11:22:31 -07:00
Jisi Liu
9bbb78f167 Remove config.h.include which is no longer needed as pbconfig.h is not a
generated file now.

Change-Id: I68b397e7fa9248abc93d5c12efd5cd31e380c9ab
2015-06-13 08:47:46 -07:00
Jisi Liu
cf141287ea Merge pull request #495 from pherl/master
Make pbconfig.h independent of config.h
2015-06-13 08:44:19 -07:00
Jisi Liu
f48dca5044 Make pbconfig.h independent of config.h
Change-Id: I31ead985b4ac5b02fb7558d34c1da19fd837b50a
2015-06-13 00:01:09 -07:00
Feng Xiao
52737c2bc8 Add appveyor.xml for windows tests. 2015-06-12 23:41:29 -07:00
Feng Xiao
54a4cccb97 Merge pull request #481 from Qartar/master
Workaround for MSVC's string literal compiler limit.
2015-06-12 14:56:02 -07:00
Feng Xiao
68c8762b98 Merge pull request #489 from tamird/go-package-descriptor
Give descriptor.proto a go package
2015-06-12 13:41:54 -07:00
Qartar
2fe6d7bc57 Workaround for MSVC's string literal compiler limit.
Escape characters don't count for string literal size, no need to pre-generate escape string.

Added unit test to touch enormous cpp generated descriptor.

Updated makefile to include enormous_descriptor.proto

Fixed language compatibility error.
2015-06-12 13:23:09 -07:00
Tamir Duberstein
66463d7e4b Give descriptor.proto a go package
This is currently done in golang/protobuf using `sed`. This change
should simplify things.
2015-06-12 06:40:18 -04:00