protobuf

Commit Graph

Author	SHA1	Message	Date
Konstantin Podsvirov	db01460042	Improved configure.ac parsing	9 years ago
Feng Xiao	0087da9d47	Merge remote-tracking branch 'origin/master' into beta-1 Conflicts: src/google/protobuf/extension_set.h	9 years ago
Joshua Haberman	cee703d736	Merge pull request #776 from haberman/pyfix Fix for https://github.com/google/protobuf/issues/758	9 years ago
Josh Haberman	4472b4ad15	Fixed assignment syntax error. Change-Id: Ifef8a300258214aae8f6b8516fbc61b7335b5724	9 years ago
Josh Haberman	fc80fad9d5	Fix for https://github.com/google/protobuf/issues/758 Change-Id: I590b34b96c84a3ba6e094a0bd86f153147ade3d3	9 years ago
Feng Xiao	f0640b5a04	Merge pull request #770 from pkasting/string_space Move StringSpaceUsedIncludingSelf to lite library.	9 years ago
Feng Xiao	69ac02a216	Merge pull request #771 from pkasting/static_init_1 Remove a static initializer by removing a global of non-POD type.	9 years ago
Feng Xiao	67946e98a9	Merge pull request #569 from redivo/master Fix GOOGLE_PROTOBUF_ATOMICOPS_ERROR syntax error	9 years ago
Feng Xiao	fb0af6d02e	Merge pull request #768 from pkasting/time Delete kNanosPerSecond from time.cc.	9 years ago
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.	9 years ago
Feng Xiao	47210ccd77	Merge pull request #746 from zmodem/fix_predict_macros2 Fix the no-op definitions of GOOGLE_PREDICT_{TRUE,FALSE}	9 years ago
Feng Xiao	59b360f651	Merge pull request #767 from pkasting/port Avoid #including system headers from inside a namespace.	9 years ago
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.	9 years ago
Feng Xiao	26f0c678f6	Merge pull request #765 from xfxyjwf/javadoc Fix javadoc errors.	9 years ago
Peter Kasting	d680159527	Delete kNanosPerSecond from time.cc. This variable is unused, and thus triggers a build warning on MSVC.	9 years ago
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.	9 years ago
Feng Xiao	245224902a	Fix javadoc errors.	9 years ago
Feng Xiao	23408684b4	Merge pull request #759 from TeBoring/beta-1-2 Fix Protobuf.podspec	9 years ago
TeBoring	fe98264317	Fix Protobuf.podspec	9 years ago
Jisi Liu	08575d9595	Merge pull request #757 from xfxyjwf/python_failure Excludes a failing python cpp test case.	9 years ago
Feng Xiao	a3a2605d5c	Excludes a failing python cpp test case.	9 years ago
Feng Xiao	1942a2bd2e	Make jruby use Java 3.0.0-alpha-3.	9 years ago
Feng Xiao	8e102ad158	Update generated file.	9 years ago
Feng Xiao	fcdcf88d8a	Fix merge conflict.	9 years ago
Feng Xiao	f900837afa	Merge pull request #756 from TeBoring/beta-1 Add distribution for objc	9 years ago
Feng Xiao	a3312983d6	Update Makefile.am to include missing files.	9 years ago
Feng Xiao	99e1868586	Add missing files in dist.	9 years ago
Bo Yang	1c81d0f8be	Add distribution for objc	9 years ago
Jisi Liu	28595b25ba	Merge pull request #755 from pherl/beta-1 Add bazel build/workspace into distribution.	9 years ago
Jisi Liu	4008100e37	Add bazel build/workspace into distribution. Change-Id: I96fbe5c84a04f5d95c5484002404fc975f2abd21	9 years ago
Feng Xiao	5b771ed651	Merge pull request #754 from xfxyjwf/changelog Update change log for beta-1.	9 years ago
Feng Xiao	cc60753820	Update change log for beta-1.	9 years ago
Paul Yang	106f3eb985	Merge pull request #750 from TeBoring/beta-1 Fix bugs for objectivec	9 years ago
TeBoring	aca5a60883	Fix bugs for objectivec	9 years ago
Feng Xiao	e94e062b58	Merge branch 'master' of github.com:google/protobuf into beta-1	9 years ago
Joshua Haberman	c7a1f8ec3b	Merge pull request #728 from dano/py3_str_compat Get all tests passing on Python3 (except Python3.4 cpp implementation)	9 years ago
Feng Xiao	fecc3d5963	Update post_process_dist.sh vsproject files no longer exist.	9 years ago
Feng Xiao	08da3d4997	Merge pull request #751 from xfxyjwf/version_number Update version number.	9 years ago
Feng Xiao	7ecc19f04f	Merge pull request #752 from google/jtattermusch-patch-1 Update README.md for C#	9 years ago
Jan Tattermusch	8fca6f83c6	Update README.md for C#	9 years ago
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.	9 years ago
Feng Xiao	047a97ff44	Merge pull request #749 from xfxyjwf/mingw_endian Assume LITTLE_ENDIAN for windows build	9 years ago
Feng Xiao	d9f4636818	Add a TODO to clean-up the LITTLE_ENDIAN macro.	9 years ago
Feng Xiao	b47bf4c930	Assume LITTLE_ENDIAN for windows build.	9 years ago
Feng Xiao	d7d9accc1d	Merge pull request #748 from xfxyjwf/unused_typedef Remove an unused typedef.	9 years ago
Feng Xiao	b7bbe54321	Remove an unused typedef.	9 years ago
Feng Xiao	042bfaf67f	Merge remote-tracking branch 'origin/master' into beta-1	9 years ago
Feng Xiao	b00595a3a9	Merge pull request #709 from xfxyjwf/map_bug Fix JSON map fields parsing.	9 years ago
Feng Xiao	11e36b1c39	Merge pull request #747 from jtattermusch/sign_mismatch add static cast to silence signedness comparison warning	9 years ago
Jan Tattermusch	276ce8c15b	add static cast to silence signedness comparison warning	9 years ago

1 2 3 4 5 ...

2718 Commits (db014600427ad3618625d20f4ad6b5a2e3b7bdd2) All Branches Search

2718 Commits (db014600427ad3618625d20f4ad6b5a2e3b7bdd2)

All Branches