From f87e5b7e74d693387f140882a427c152e85592b1 Mon Sep 17 00:00:00 2001 From: Bo Yang Date: Sun, 24 May 2015 00:13:26 -0700 Subject: Fix C2385: accessing parent classes' member without specifying is ambiguous. --- .gitignore | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 38755c96..03d163a4 100644 --- a/.gitignore +++ b/.gitignore @@ -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 -- cgit v1.2.3