organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
1175 commits 28 branches 36 tags 41 MiB
Commit graph

403 commits

Author SHA1 Message Date
Feng Xiao
a22bc812a4 Merge pull request #186 from ennerf/win32-msvc-fix 
MSVC protoc compiler fix
 2015-02-02 19:37:58 -08:00
Joshua Haberman
17e4419188 Merge pull request #168 from cfallin/ruby-oneof 
Support oneofs in MRI Ruby C extension.
 2015-02-02 13:29:15 -08:00
Florian Enner
e544b38815 removed accidental whitespace 2015-02-02 15:19:01 -05:00
Florian Enner
e1e86b02a8 replaced type fix with the recommended way 2015-01-31 19:22:52 -05:00
Florian Enner
df4730ca9c fixed MSVC compile error 
<stdint.h> is not part of the standard, so I've added a workaround.
 2015-01-31 19:01:34 -05:00
Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com)
f01c1441bc Fix illegal C++ use of reinterpret_cast<> to cast between nullptr_t and a pointer. 2015-01-27 15:44:38 +00:00
Chris Fallin
b0670ddae7 Fix golden-file Ruby test to work with out-of-tree builds. 2015-01-14 16:46:10 -08:00
Chris Fallin
3f3820d8f8 Two tests for Ruby code generator: 
- A golden-file test that ensures protoc produces known-valid output.
- A Ruby test that loads that golden file and ensures it actually works
  with the extension.

This split strategy allows us to test end-to-end without needing to
integrate the Ruby gem build system and the protoc build system. This is
desirable because we do not want a gem build/install to depend on
building protoc, and we do not want building protoc to depend on
building and testing the gem.
 2015-01-14 15:44:46 -08:00
Chris Fallin
7c4bbf07a5 Support oneofs in the Ruby code generator. 2015-01-14 14:56:17 -08:00
zhangkun83
a6b3ab09e8 Align backslash vertically 2015-01-12 15:56:07 -08:00
zhangkun83
aa1713d9a4 Include names.h as java_names.h in the opensource tree 2015-01-12 15:38:59 -08:00
Kal Conley
c3e928021f Improved little endian byte order detection 
Including <sys/param.h> on Mac/iOS doesn't define __BYTE_ORDER so
PROTOBUF_LITTLE_ENDIAN was never being defined. This commit adds a check
for the __LITTLE_ENDIAN__ macro which is defined by clang and Apple gcc on
little endian architectures.
 2014-12-16 02:30:45 +01:00
Chris Fallin
5ce69e991a Support Ruby code generation only for proto3. 2014-12-12 18:27:19 -08:00
Feng Xiao
044e095a9b Add missing header files in src/Makefile.am 2014-12-12 17:50:43 -08:00
Chris Fallin
91473dcebf Rename protobuf Ruby module to google/protobuf and rework its build 
system. The Ruby module build now uses an amalgamated distribution of
upb, and successfully builds a Ruby gem called 'google-protobuf' with
module 'google/protobuf'.
 2014-12-12 15:58:26 -08:00
Feng Xiao
f473bb9903 Merge pull request #128 from krishnanm86/master 
Source code refactoring. Extracted common functionality in cpp_helpers.c...
 2014-12-12 11:13:15 -08:00
Krishna
2e9f5e3bac Reverting the space at the end for both files changed 2014-12-12 10:26:25 +01:00
Krishna
91552adb77 Reverting the space at the end 2014-12-12 10:25:06 +01:00
Krishna
22f96a713c Returned print_indent and print_outdent back to printservicestub and printserviceclass in python generator 2014-12-12 10:22:48 +01:00
Feng Xiao
001e82a7e0 Merge pull request #113 from nsuke/oneof-c++11 
Make C++ code generation of string oneof field compatible with C++11
 2014-12-11 16:05:06 -08:00
Krishna
060a2096a3 Reverted changes to cpp_helpers.cc and made code reviews to python_geenerator.cc 2014-12-11 07:45:32 +01:00
Feng Xiao
52909485d1 Merge branch v3.0.0-alpha-1 into master. 
Conflicts:
	configure.ac
 2014-12-10 20:56:13 -08:00
Krishna
7654f78029 Fixed bugs 2014-12-10 21:02:12 +01:00
Krishna
a761f061f4 Source code refactoring. Extracted common functionality in cpp_helpers.cc and python/python_generator.cc 2014-12-10 20:39:34 +01:00
Feng Xiao
8d5d7cc6d0 Fix LIBPROTOBUF_PROTOBUF annotations for buliding protobuf as DLLs. 2014-12-09 17:05:10 -08:00
Chris Fallin
973f425725 Provide a Ruby extension. 
This adds a Ruby extension in ruby/ that is based on the 'upb' library
(now included as a submodule), and adds support for Ruby code generation
to the protoc compiler.
 2014-12-09 16:55:59 -08:00
Feng Xiao
496d47c27f Remove map_field.cc from lite-runtime. 2014-12-09 15:47:25 -08:00
Feng Xiao
be20ae0b69 Fix compile issues and test failures in VS2008. 2014-12-05 02:54:43 -08:00
Feng Xiao
d77877808f Fix thread local annotatoin and add back type traits is_convertable for MSVC 2014-12-04 17:30:58 -08:00
Feng Xiao
0eaae1e6ce Replace is_enum with is_proto_enum because is_enum is not supported on some platforms. 2014-12-03 18:15:19 -08:00
Feng Xiao
137dd0f17f Delete some globals in ShutdownProtobufLibrary(). 2014-12-03 16:31:47 -08:00
Feng Xiao
58dfce9384 Update version number in descriptor.pb.h and plugin.pb.h. Protect death 
tests with macro PROTOBUF_HAS_DEATH_TEST.
 2014-12-03 12:12:17 -08:00
Feng Xiao
81a630c66e Update version number to v3.0.0-alpha-1 2014-12-03 11:52:21 -08:00
Nobuaki Sukegawa
2413cb57ef Make C++ string oneof field compatible with C++11 
string oneof field was generated into "const ArenaStringPtr" field inside
"default_oneof_instance_" struct (of name "<class name>OneofInstance").

On the other hand, in C++11, const field of type with trivial default
constructor causes enclosing type's implicit default constructor to be deleted.

Since ArenaStringPtr has tirvial default constructor, this caused default
constructor of "default_oneof_instance_" struct to be deleted, making the
constructor call inside generated code invalid and fail to compile.
 2014-12-03 23:41:40 +09:00
Nobuaki Sukegawa
4470dcba6c Display element name in test error log 2014-12-03 23:05:45 +09:00
Nobuaki Sukegawa
8ba0e35764 Make test code runnable with C++11 
Preprocessor token right after string literal without whitespace results
in parse failure in C++11.
 2014-12-03 23:05:45 +09:00
Feng Xiao
a451681937 Merge pull request #116 from xfxyjwf/fix_warnings 
Get rid of some build warnings.
 2014-12-02 15:47:31 -08:00
Feng Xiao
e559b51b8d Merge pull request #81 from xfxyjwf/syntax_warning 
Report a warning if the proto file doesn't have a syntax statement.
 2014-12-02 15:45:36 -08:00
Feng Xiao
9173ba22a9 Get rid of some build warnings. 2014-12-02 15:28:11 -08:00
Feng Xiao
7d4117c412 Merge pull request #110 from nsuke/tb-typo-cpp_extension 
Fix typo
 2014-11-26 17:06:31 -08:00
Feng Xiao
c25d9feb4d Down-integrate from internal code base. 2014-11-26 16:15:29 -08:00
Nobuaki Sukegawa
e5a17998cc Fix typo 2014-11-27 03:28:57 +09:00
Jisi Liu
241921c666 Merge branch 'master' of github.com:google/protobuf 2014-11-25 14:55:18 -08:00
Jisi Liu
e9bbfbcd38 Link Java Nano generator into protoc. 2014-11-25 14:47:04 -08:00
Feng Xiao
6ae3bde73d Fix issue 99. 2014-11-25 14:01:44 -08:00
Łukasz Twarduś
dd449e1c79 Fix "anonymous types declared in an anonymous union are an extension" 
warning when using clang with -pedantic switch
 2014-11-25 19:25:38 +01:00
Feng Xiao
99aa0f9e8f Down-integrate from internal code base. 2014-11-20 16:18:53 -08:00
Feng Xiao
95c25918aa Merge nano proto into protobuf repository. 
Source: https://android.googlesource.com/platform/external/protobuf.git
 2014-11-19 17:14:29 -08:00
Feng Xiao
cd980d1c13 Prepare nano proto code to be merged into protobuf repository. 2014-11-19 15:58:54 -08:00
Tres Seaver
4113685cdd Fix testcase compile failure under gcc 4.6: 
google/protobuf/map_test.cc:88:16: error: expected ‘;’ at end of member declaration
google/protobuf/map_test.cc:88:18: error: ‘override’ does not name a type
.
 2014-11-18 11:58:21 -05:00