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

2145 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bo Yang
3a5455b34b uint64 has non-trivial destructor on 32-bit windows. This cause arena 
allocator to allocate memory twice for uint64.
 2015-05-26 13:12:16 -07:00
Paul Yang
cdd5b3b84b Merge pull request #426 from thomasvl/mac_fixup_for_a3_branch 
ObjC fixup for the branch.
 2015-05-26 12:46:25 -07:00
Feng Xiao
621bf82065 Null-terminate C strings. 
Change-Id: I85675bfcd7697bb058b9af475445a6bfdd7fd967
 2015-05-26 11:40:37 -07:00
Thomas Van Lenten
58cd4a47e8 ObjC fixup for the branch. 
- Shouldn't need SRCROOT in the project since Xcode should be setting the working directory to where the project lives.
- Remove the packed/unpacked repeated enum field in the tests and update the code to handle the defaults.
- Move up the ignore to cover .DS_Store files in src also.

add starstar
 2015-05-26 14:01:54 -04:00
Paul Yang
973bec13b3 Merge pull request #424 from jcanizales/make-objc-helpers-available-to-other-plugins 
Adds objectivec_helpers.h to the headers installed by make.
 2015-05-26 11:01:26 -07:00
Jorge Canizales
7e53cf7789 Add ObjC helpers header to vsproject/extract_includes.bat 2015-05-26 10:47:30 -07:00
Jorge Canizales
0d3b36ad54 Adds objectivec_helpers.h to the headers installed by make. 2015-05-26 10:46:09 -07:00
Feng Xiao
8e1426800e Replace the check of "../.git" 
Checking the existence of ".git" is not the right way to check whether we
are in develop environment because we distribute source tar-balls where
such a ".git" directory does not exist. Replaced it with checking .proto
files.
 2015-05-26 00:11:09 -07:00
Bo Yang
0ac523bfee Add new headers to extract_includes.bat 2015-05-25 22:57:08 -07:00
Bo Yang
51de7a7141 Add new files to Makefile.am 2015-05-25 22:21:05 -07:00
Bo Yang
632e8e26ce Add csharp_EXTRA_DIST to all_EXTRA_DIST. 2015-05-25 20:20:54 -07:00
TeBoring
e9d0bb4aaa Add new files for java runtime to Makefile.am 2015-05-25 20:17:04 -07:00
Feng Xiao
4e0c46f93d Explicitly call destructor of Mutex to release resources. 
Change-Id: I808f4a3689e723d4490aa9ba6f1c14e3936ddcec
 2015-05-25 19:04:00 -07:00
Feng Xiao
72f17c4367 Make hash_map forward constructor parameters to its base class. 
We use a custom allocator for map fields and this allocator must be
passed correctly to hash_map to make sure it's allocated properly
with our custom allocator.

Change-Id: Ie59fa24bf11ff28ffd0fa870e24e456c66b2b9c5
 2015-05-25 18:18:29 -07:00
Bo Yang
9907286855 Add csharp files to Makefile.am 2015-05-25 17:06:18 -07:00
Bo Yang
4edc1bbadf Add objectivec/generate_descriptors_proto.sh in Makefile.am 2015-05-25 16:18:12 -07:00
Bo Yang
a9332e201d Copy two data files from ruby/tests to src/google/compiler/ruby. Tests in src/google/compiler/ruby depend on these two files, but they were missed in language distributions other than ruby 2015-05-25 16:04:36 -07:00
TeBoring
eef79f3ef0 Remove useless slash in Makefile.am 2015-05-25 13:08:09 -07:00
Bo Yang
50a765ba03 Fix bugs in objective-c. 2015-05-25 12:48:03 -07:00
Paul Yang
ad0a5cab52 Merge pull request #422 from google/3.0.0-alpha-3-windows-fix 
3.0.0 alpha 3 windows fix
 2015-05-25 02:02:27 -07:00
Bo Yang
cf603a9dfa Fix bugs on windows. 2015-05-24 23:03:05 -07:00
Paul Yang
3ff9592561 Merge pull request #421 from TeBoring/3.0.0-alpha-3-fix 
Fix c++ on windows
 2015-05-24 15:33:20 -07:00
teboring
b175c72e5b Merge branch '3.0.0-alpha-3-fix' of https://github.com/TeBoring/protobuf into 3.0.0-alpha-3-fix 2015-05-24 15:18:29 -07:00
teboring
8565e1e1ef Add missing files for test to *.vcproj files 2015-05-24 15:17:41 -07:00
Paul Yang
8ee267dda7 Merge pull request #420 from TeBoring/3.0.0-alpha-3-fix 
Fix C2385: ambiguous access to parent classes' member without specifying
 2015-05-24 00:35:56 -07:00
Bo Yang
f87e5b7e74 Fix C2385: accessing parent classes' member without specifying is ambiguous. 2015-05-24 00:13:26 -07:00
teboring
a7393c0b26 Allow csharp to be configured as a language in configure.ac 2015-05-23 23:34:59 -07:00
Paul Yang
bad9071dea Merge pull request #419 from TeBoring/3.0.0-alpha-3-fix 
Add missing files to *.vcproj
 2015-05-23 22:52:55 -07:00
teboring
2e663048e3 Add missing files to *.vcproj 2015-05-23 22:28:49 -07:00
Paul Yang
409b4b483c Merge pull request #418 from TeBoring/3.0.0-alpha-3-fix 
Clean up *.vcproj files
 2015-05-23 19:33:38 -07:00
teboring
4baf49ec70 Clean up *.vcproj files 2015-05-23 18:34:38 -07:00
teboring
3af2f4d469 Add two languages (objectivec and csharp) to post_process_dist.sh 2015-05-23 10:38:56 -07:00
Paul Yang
7b27eec009 Merge pull request #416 from TeBoring/master 
Update version number to 3.0.0-alpha-3
 2015-05-23 10:25:03 -07:00
teboring
9839c0c2c9 Update version number to 3.0.0-alpha-3 2015-05-23 09:20:23 -07:00
Feng Xiao
55df12194f Merge pull request #341 from yukawa/fix-undef-GOOGLE_PROTOBUF_MISSING_HASH 
Undef GOOGLE_PROTOBUF_MISSING_HASH after it is used.
 2015-05-22 15:56:34 -07:00
Paul Yang
48f95941bc Merge pull request #410 from thomasvl/objc_alpha2_drop 
Objective C Second Alpha Drop
 2015-05-22 14:12:15 -07:00
Thomas Van Lenten
1dcc329427 Objective C Second Alpha Drop 
- Style fixups in the code.
- map<> serialization fixes and more tests.
- Autocreation of map<> fields (to match repeated fields).
- @@protoc_insertion_point(global_scope|imports).
- Fixup proto2 syntax extension support.
- Move all startup code to +initialize so it happen on class usage and not app startup.
- Have generated headers use forward declarations and move imports into generated code, reduces what is need at compile time to speed up compiled and avoid pointless rippling of rebuilds.
 2015-05-22 14:27:31 -04:00
Paul Yang
d94e65afda Merge pull request #413 from TeBoring/master 
down-integrate internal changes
 2015-05-21 20:11:26 -07:00
Bo Yang
5db217305f down-integrate internal changes 2015-05-21 19:32:02 -07:00
Paul Yang
e1000189bf Merge pull request #411 from xfxyjwf/master 
Add default import paths for descriptor.proto and well-known protos.
 2015-05-21 18:45:23 -07:00
Paul Yang
5eb73dfcce Merge pull request #412 from xfxyjwf/java_wkt 
Include well-known types in Java runtime.
 2015-05-21 18:34:08 -07:00
Feng Xiao
1aacb4fbbf Include well-known types in Java runtime. 
Change-Id: I816fe2fac7fccbcd96dd8510c7c9b5e7996aeadc
 2015-05-21 17:28:05 -07:00
Feng Xiao
e9abc404df Add default import paths for descriptor.proto and other well-known types to protoc. 
Change-Id: I4afa295de4c8ed2a4cd0919cf84aedcd1327d9a5
 2015-05-21 16:45:47 -07:00
Paul Yang
56095026cc Merge pull request #389 from jcanizales/add-podspec 
Adds a podspec for the proto3 Objective-C runtime.
 2015-05-21 14:16:34 -07:00
Paul Yang
c3480926f9 Merge pull request #402 from thomasvl/objc_on_win 
Getting the ObjC generator building on Windows.
 2015-05-21 11:20:15 -07:00
Jan Tattermusch
3668a224f3 Merge pull request #394 from ironhidegames/csharp-aot-ios 
Solves AOT compilation issue for Unity - iOS
 2015-05-21 08:48:27 -07:00
Ruben Garat
83bcfefb0b added concrete IEqualityComparer<ExtensionIntPair> implementation in ExtensionRegistryLite.cs to prevent AOT compilation issue with unity in iOS 2015-05-20 18:07:09 -03:00
Feng Xiao
08ec9dcb0b Merge pull request #406 from AustinSchuh/unsigned_has_bits 
Marked compiler literal unsigned.
 2015-05-20 10:23:40 -07:00
Jie Luo
f71eea8873 Merge pull request #399 from jtattermusch/csharp_travis 
C# travis integration
 2015-05-20 10:20:37 -07:00
Austin Schuh
e826837f7e Marked compiler literal unsigned. 
When compiling a protobuf with gcc 3.3.2 for powerpc, I ran into the
following warning message:

INFO: From Compiling my_proto.pb.cc powerpc-603e-linux-gcc:
bazel-out/local_linux-dbg/genfiles/my_proto.pb.cc: In member
   function `virtual void MyProto::Clear()':
   bazel-out/local_linux-dbg/genfiles/my_proto.pb.cc:223: warning: this
      decimal constant is unsigned only in ISO C90

The line in the proto file that was triggering it was:

  if (_has_bits_[24 / 32] & 4278190080) {
    ZR_(field1_, field2_);
  }

_has_bits_ is a uint32.  The constant mask should therefore be
unsigned.  This change updates the constant to be generated as
unsigned.
 2015-05-19 23:22:20 -07:00