diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2015-07-20 11:06:17 -0700 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2015-07-20 11:06:17 -0700 |
| commit | aba42edd8c3c5ae4edeebdacd1a3b4192bd5550f (patch) | |
| tree | b6f22f84e6109a51b59bf8092e36b69dbe9c6e49 /ruby/lib/google/protobuf.rb | |
| parent | 58035596e7864c66008a1f6222dce54031610ff4 (diff) | |
| parent | c2c43a4917d7da263e360a4096d6603da8535bdf (diff) | |
| download | protobuf-aba42edd8c3c5ae4edeebdacd1a3b4192bd5550f.tar.gz protobuf-aba42edd8c3c5ae4edeebdacd1a3b4192bd5550f.tar.bz2 protobuf-aba42edd8c3c5ae4edeebdacd1a3b4192bd5550f.zip | |
Merge pull request #604 from haberman/ruby-conformance
Added Ruby to conformance tests.
Diffstat (limited to 'ruby/lib/google/protobuf.rb')
| -rw-r--r-- | ruby/lib/google/protobuf.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ruby/lib/google/protobuf.rb b/ruby/lib/google/protobuf.rb index 99b17929..f0eb6268 100644 --- a/ruby/lib/google/protobuf.rb +++ b/ruby/lib/google/protobuf.rb @@ -31,6 +31,15 @@ # require mixins before we hook them into the java & c code require 'google/protobuf/message_exts' +# We define these before requiring the platform-specific modules. +# That way the module init can grab references to these. +module Google + module Protobuf + class Error < StandardError; end + class ParseError < Error; end + end +end + if RUBY_PLATFORM == "java" require 'json' require 'google/protobuf_java' |