diff options
| author | Bo Yang <teboring@google.com> | 2015-05-24 00:13:26 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2015-05-24 00:13:26 -0700 |
| commit | f87e5b7e74d693387f140882a427c152e85592b1 (patch) | |
| tree | 162dfe258ecf14d2dd401e481725cc74b0f8efd0 /.gitignore | |
| parent | 2e663048e34fcf347385d987428155c649463140 (diff) | |
| download | protobuf-f87e5b7e74d693387f140882a427c152e85592b1.tar.gz protobuf-f87e5b7e74d693387f140882a427c152e85592b1.tar.bz2 protobuf-f87e5b7e74d693387f140882a427c152e85592b1.zip | |
Fix C2385: accessing parent classes' member without specifying is ambiguous.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -90,3 +90,12 @@ objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/xcuserdata/ objectivec/ProtocolBuffers_OSX.xcodeproj/xcuserdata/ objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcuserdata/ objectivec/ProtocolBuffers_iOS.xcodeproj/xcuserdata/ + +# Comformance test output +conformance/.libs/ +conformance/com/ +conformance/conformance-cpp +conformance/conformance-test-runner +conformance/conformance.pb.cc +conformance/conformance.pb.h +conformance/protoc_middleman |