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

1105 commits

This branch
This branch
All branches
Author SHA1 Message Date
Feng Xiao
fe3be0bea1 Fix vsprojects/extract_includes.bat 2014-12-09 14:47:30 -08:00
Feng Xiao
7da8121771 Fix the intermediate directory of vc project files. 2014-12-09 14:47:29 -08:00
Feng Xiao
9104da3261 Down-integrate from internal code base. 2014-12-09 11:57:52 -08:00
Feng Xiao
be20ae0b69 Fix compile issues and test failures in VS2008. 2014-12-05 02:54:43 -08:00
Feng Xiao
7c939bcb25 Update VC projects to include new source files. 2014-12-04 19:10:36 -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
6a949cda37 Remove usage of features not supported in Java 1.6. 2014-12-03 18:23:49 -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
6936f17b88 Update post_process_dist.sh to produce a separate package for each 
language.
 2014-12-03 17:37:42 -08:00
Feng Xiao
137dd0f17f Delete some globals in ShutdownProtobufLibrary(). 2014-12-03 16:31:47 -08:00
Feng Xiao
35ef68056c Add a missing Java dist file. 2014-12-03 15:45:28 -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
Feng Xiao
77931993f4 Explicitly list all Java lite runtime tests (and exclude those depending 
TestUtil which transitively depend on the full runtime).
 2014-12-02 18:00:26 -08: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
e45149b4a7 Merge pull request #115 from xfxyjwf/fix_107 
Add a ./configure flag "DIST_LANG".
 2014-12-02 15:47:00 -08:00
Feng Xiao
ef4311302f Merge pull request #111 from xfxyjwf/googlebot 
Replace links in nano proto code.
 2014-12-02 15:46:08 -08:00
Feng Xiao
9e9ca4b60a Merge pull request #105 from xfxyjwf/fix_92 
Fix Python C++ implementation build issues
 2014-12-02 15:45:45 -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
8f7dec8ee1 Add a ./configure flag "DIST_LANG" to select which langauge to include 
in a distribution package.
 2014-12-02 14:15:26 -08:00
Feng Xiao
7f2a9fb1af Merge pull request #102 from fizbin/bytestring_serializable 
Make ByteStrings serializable with java serialization.
 2014-11-27 18:49:11 -08:00
Daniel Martin
a32a1a761b Add tests for other ByteString subclasses 2014-11-27 07:11:03 -05:00
Feng Xiao
bdcdee0a1d Merge pull request #109 from nsuke/tb-vim-oneof 
Add oneof keyword to proto.vim
 2014-11-26 17:06:49 -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
061065993f Replace links in nano proto code. 2014-11-26 16:58:20 -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
Nobuaki Sukegawa
33bb176603 Add oneof keyword to proto.vim 2014-11-27 02:57:31 +09:00
Feng Xiao
90f2f50233 Make Java TextFormat.printToUnicodeString() escape newlines. 
Fix issue #77
 2014-11-25 17:09:07 -08:00
Feng Xiao
209840eca7 Merge pull request #106 from xfxyjwf/fix_62 
Fix javadoc warnings.
 2014-11-25 16:48:07 -08:00
Feng Xiao
418ece3bd1 Fix javadoc warnings. 2014-11-25 16:15:02 -08:00
Feng Xiao
d1ec493a12 Fix Python C++ implementation build issues: 
1. Haven't included the include path for "config.h".
  2. Use of C++11 auto keyword.
 2014-11-25 15:21:08 -08:00
Jisi Liu
7d2db50b21 Merge pull request #104 from pherl/master 
Link Java Nano generator into protoc.
 2014-11-25 15:12:24 -08: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
Feng Xiao
7f3a25bebd Merge pull request #103 from Ang3lus/master 
Fix "anonymous types declared in an anonymous union are an extension" warning when using clang with -pedantic switch
 2014-11-25 11:46:39 -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
Daniel Martin
5ff8dc8e00 Make ByteStrings serializable with java serialization. 2014-11-25 13:00:03 -05:00
Feng Xiao
99aa0f9e8f Down-integrate from internal code base. 2014-11-20 16:18:53 -08:00
Feng Xiao
49bc8c0963 Add nano proto authors and update LICENSE file to include Android.mk. 2014-11-20 14:27:46 -08:00
Feng Xiao
aa8ef98a1f Merge pull request #91 from xfxyjwf/android_nano 
Merge nano proto into protobuf repository.
 2014-11-20 14:22:55 -08:00
Feng Xiao
9e65d4bfb3 Fix the broken link at the bottom of javanano/README.txt 2014-11-20 14:21:43 -08:00
Feng Xiao
8a87fb8ecf Merge pull request #79 from xfxyjwf/license 
Update LICENSE to list files that aren't copyrighted by Google Inc.
 2014-11-20 14:17:29 -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
Feng Xiao
6a51460b98 Merge pull request #89 from tseaver/ignore-map_generated_files 
Ignore files generated from new 'map*.protobuf' sources.
 2014-11-18 15:43:23 -08:00
Tres Seaver
e9d18bca28 Ignore files generated from new 'map*.protobuf' sources. 2014-11-18 18:41:40 -05:00
Feng Xiao
db90dff872 Merge pull request #88 from tseaver/fix-class_key_must_be_declared_w_friend 
Fix compiler error: "a class-key must be used when declaring a friend"
 2014-11-18 15:02:09 -08:00