third_party/protobuf/ruby/lib/google/protobuf.rb - Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/ruby/lib/google/protobuf.rb

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: owners Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/ruby/google-protobuf.gemspec ('k') | third_party/protobuf/ruby/lib/google/protobuf/repeated_field.rb » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/ruby/lib/google/protobuf.rb

diff --git a/third_party/protobuf/ruby/lib/google/protobuf.rb b/third_party/protobuf/ruby/lib/google/protobuf.rb

index f0eb626824f23b6dcd858ec820d57bcd246439de..62bdd1bf1af30552a1745e3dda399f7deb08ccce 100644

--- a/third_party/protobuf/ruby/lib/google/protobuf.rb

+++ b/third_party/protobuf/ruby/lib/google/protobuf.rb

@@ -44,7 +44,11 @@ if RUBY_PLATFORM == "java"

require 'json'

require 'google/protobuf_java'

else

- require 'google/protobuf_c'

+ begin

+ require "google/#{RUBY_VERSION.sub(/\.\d$/, '')}/protobuf_c"

+ rescue LoadError

+ require 'google/protobuf_c'

+ end

end

require 'google/protobuf/repeated_field'