AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
2,718 Commits 35 Branches 138 Tags 124 MiB
0101a59b62
Commit Graph

2718 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jon Skeet
0101a59b62 Remove vestigial reference to MakeFixedTag 2015-09-01 13:27:26 +01:00
Feng Xiao
0087da9d47 Merge remote-tracking branch 'origin/master' into beta-1 
Conflicts:
	src/google/protobuf/extension_set.h
 2015-08-29 16:42:55 -07:00
Joshua Haberman
cee703d736 Merge pull request #776 from haberman/pyfix 
Fix for https://github.com/google/protobuf/issues/758
 2015-08-29 16:29:23 -07:00
Josh Haberman
4472b4ad15 Fixed assignment syntax error. 
Change-Id: Ifef8a300258214aae8f6b8516fbc61b7335b5724
 2015-08-28 19:21:49 -07:00
Josh Haberman
fc80fad9d5 Fix for https://github.com/google/protobuf/issues/758 
Change-Id: I590b34b96c84a3ba6e094a0bd86f153147ade3d3
 2015-08-28 16:34:48 -07:00
Feng Xiao
f0640b5a04 Merge pull request #770 from pkasting/string_space 
Move StringSpaceUsedIncludingSelf to lite library.
 2015-08-28 14:09:00 -07:00
Feng Xiao
69ac02a216 Merge pull request #771 from pkasting/static_init_1 
Remove a static initializer by removing a global of non-POD type.
 2015-08-28 14:05:01 -07:00
Feng Xiao
67946e98a9 Merge pull request #569 from redivo/master 
Fix GOOGLE_PROTOBUF_ATOMICOPS_ERROR syntax error
 2015-08-28 13:34:35 -07:00
Feng Xiao
fb0af6d02e Merge pull request #768 from pkasting/time 
Delete kNanosPerSecond from time.cc.
 2015-08-28 10:28:44 -07:00
Peter Kasting
4f3bead537 Remove a static initializer by removing a global of non-POD type. 
These are banned by the Google style guide, and Chromium has a hard
no-new-static-initializers policy preventing updating to a new version of
libprotobuf unless this is resolved.  This is the first such change, I'll need
to make at least one more in the future.

Luckily, the protobuf source tree already has an alternative to static
initializers in once.h; use that machinery instead.

I defined everything in the .cc file in a blob to replace the old implementation
rather than matching the .h layout precisely; let me know if a different
ordering is preferred.  I also eliminated the macro that used to be used here as
spelling everything out only takes one additional line, and the macro didn't
actually handle all details of using a particular member variable, just the
declaration, so it felt a bit error-prone.
 2015-08-27 20:16:33 -07:00
Feng Xiao
47210ccd77 Merge pull request #746 from zmodem/fix_predict_macros2 
Fix the no-op definitions of GOOGLE_PREDICT_{TRUE,FALSE}
 2015-08-27 15:52:07 -07:00
Feng Xiao
59b360f651 Merge pull request #767 from pkasting/port 
Avoid #including system headers from inside a namespace.
 2015-08-27 15:51:06 -07:00
Peter Kasting
b913cbd307 Move StringSpaceUsedIncludingSelf to lite library. 
This came up because Chromium downstream modifies the lite library in a way that
requires this function, but I'm upstreaming it because based on the comments in
repeated_field.h, this ought to allow resolution of an existing hack.

I don't know enough about the protobuf code to feel confident trying to resolve
this hack myself, so I've merely updated the TODO comments.
 2015-08-27 14:37:18 -07:00
Feng Xiao
26f0c678f6 Merge pull request #765 from xfxyjwf/javadoc 
Fix javadoc errors.
 2015-08-27 14:34:19 -07:00
Peter Kasting
d680159527 Delete kNanosPerSecond from time.cc. 
This variable is unused, and thus triggers a build warning on MSVC.
 2015-08-27 14:19:51 -07:00
Peter Kasting
2e789bc246 Avoid #including system headers from inside a namespace. 
port.h #includes various headers in order to define byteswap functions, but it
currently does so from inside the google::protobuf namespace.  This can cause
bizarre symbol conflicts and other build errors as these headers' contents are
then included inside this namespace.

Instead, #include the relevant headers above the namespace declarations.
 2015-08-27 14:16:10 -07:00
Feng Xiao
245224902a Fix javadoc errors. 2015-08-27 14:02:25 -07:00
Feng Xiao
23408684b4 Merge pull request #759 from TeBoring/beta-1-2 
Fix Protobuf.podspec
 2015-08-27 00:02:06 -07:00
TeBoring
fe98264317 Fix Protobuf.podspec 2015-08-26 23:55:33 -07:00
Jisi Liu
08575d9595 Merge pull request #757 from xfxyjwf/python_failure 
Excludes a failing python cpp test case.
 2015-08-26 22:01:55 -07:00
Feng Xiao
a3a2605d5c Excludes a failing python cpp test case. 2015-08-26 21:56:26 -07:00
Feng Xiao
1942a2bd2e Make jruby use Java 3.0.0-alpha-3. 2015-08-26 21:20:59 -07:00
Feng Xiao
8e102ad158 Update generated file. 2015-08-26 20:59:59 -07:00
Feng Xiao
fcdcf88d8a Fix merge conflict. 2015-08-26 20:35:35 -07:00
Feng Xiao
f900837afa Merge pull request #756 from TeBoring/beta-1 
Add distribution for objc
 2015-08-26 20:34:13 -07:00
Feng Xiao
a3312983d6 Update Makefile.am to include missing files. 2015-08-26 20:29:01 -07:00
Feng Xiao
99e1868586 Add missing files in dist. 2015-08-26 20:19:05 -07:00
Bo Yang
1c81d0f8be Add distribution for objc 2015-08-26 18:15:39 -07:00
Jisi Liu
28595b25ba Merge pull request #755 from pherl/beta-1 
Add bazel build/workspace into distribution.
 2015-08-26 17:53:33 -07:00
Jisi Liu
4008100e37 Add bazel build/workspace into distribution. 
Change-Id: I96fbe5c84a04f5d95c5484002404fc975f2abd21
 2015-08-26 17:48:08 -07:00
Feng Xiao
5b771ed651 Merge pull request #754 from xfxyjwf/changelog 
Update change log for beta-1.
 2015-08-26 17:38:35 -07:00
Feng Xiao
cc60753820 Update change log for beta-1. 2015-08-26 17:37:51 -07:00
Paul Yang
106f3eb985 Merge pull request #750 from TeBoring/beta-1 
Fix bugs for objectivec
 2015-08-26 16:25:56 -07:00
TeBoring
aca5a60883 Fix bugs for objectivec 2015-08-26 16:24:06 -07:00
Feng Xiao
e94e062b58 Merge branch 'master' of github.com:google/protobuf into beta-1 2015-08-26 15:47:35 -07:00
Joshua Haberman
c7a1f8ec3b Merge pull request #728 from dano/py3_str_compat 
Get all tests passing on Python3 (except Python3.4 cpp implementation)
 2015-08-26 15:44:06 -07:00
Feng Xiao
fecc3d5963 Update post_process_dist.sh 
vsproject files no longer exist.
 2015-08-26 15:33:22 -07:00
Feng Xiao
08da3d4997 Merge pull request #751 from xfxyjwf/version_number 
Update version number.
 2015-08-26 15:31:00 -07:00
Feng Xiao
7ecc19f04f Merge pull request #752 from google/jtattermusch-patch-1 
Update README.md for C#
 2015-08-26 15:29:06 -07:00
Jan Tattermusch
8fca6f83c6 Update README.md for C# 2015-08-26 15:26:34 -07:00
Feng Xiao
ffe9215140 Update version number. 
Protoc, C++ runtime and Java runtime are updated to v3.0.0-beta-1, other
languages are updated to v3.0.0-alpha-4.
 2015-08-26 15:11:43 -07:00
Feng Xiao
047a97ff44 Merge pull request #749 from xfxyjwf/mingw_endian 
Assume LITTLE_ENDIAN for windows build
 2015-08-26 14:43:04 -07:00
Feng Xiao
d9f4636818 Add a TODO to clean-up the LITTLE_ENDIAN macro. 2015-08-26 22:40:41 +01:00
Feng Xiao
b47bf4c930 Assume LITTLE_ENDIAN for windows build. 2015-08-26 22:32:04 +01:00
Feng Xiao
d7d9accc1d Merge pull request #748 from xfxyjwf/unused_typedef 
Remove an unused typedef.
 2015-08-26 13:55:51 -07:00
Feng Xiao
b7bbe54321 Remove an unused typedef. 2015-08-26 13:45:30 -07:00
Feng Xiao
042bfaf67f Merge remote-tracking branch 'origin/master' into beta-1 2015-08-26 13:33:50 -07:00
Feng Xiao
b00595a3a9 Merge pull request #709 from xfxyjwf/map_bug 
Fix JSON map fields parsing.
 2015-08-26 13:18:04 -07:00
Feng Xiao
11e36b1c39 Merge pull request #747 from jtattermusch/sign_mismatch 
add static cast to silence signedness comparison warning
 2015-08-26 13:17:22 -07:00
Jan Tattermusch
276ce8c15b add static cast to silence signedness comparison warning 2015-08-26 13:10:05 -07:00