diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-02-19 13:22:12 -0800 |
|---|---|---|
| committer | Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-02-19 13:22:12 -0800 |
| commit | 91d0ad0fde510bc2d860044417409c7e0a9b229d (patch) | |
| tree | 7345092e7168b9d73e71a901071e03dd1e444147 /src | |
| parent | 382294106cf928955feb8e132d76194b5a8d0a20 (diff) | |
| parent | 73f5d7c0ce6226c95827c1b440fac7133dfc6cff (diff) | |
Merge pull request #5274 from murgatroid99/ruby_no_recursive_require
Ruby: explicitly require 'grpc/grpc' when loading C core, to avoid circular import warning
Diffstat (limited to 'src')
| -rw-r--r-- | src/ruby/lib/grpc/core/time_consts.rb | 4 | ||||
| -rw-r--r-- | src/ruby/lib/grpc/errors.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ruby/lib/grpc/core/time_consts.rb b/src/ruby/lib/grpc/core/time_consts.rb index e6dae7b08a..c8eae7806b 100644 --- a/src/ruby/lib/grpc/core/time_consts.rb +++ b/src/ruby/lib/grpc/core/time_consts.rb @@ -1,4 +1,4 @@ -# Copyright 2015, Google Inc. +# Copyright 2015-2016, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -27,7 +27,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -require 'grpc' +require 'grpc/grpc' # GRPC contains the General RPC module. module GRPC diff --git a/src/ruby/lib/grpc/errors.rb b/src/ruby/lib/grpc/errors.rb index f1201c1704..2227ee1f12 100644 --- a/src/ruby/lib/grpc/errors.rb +++ b/src/ruby/lib/grpc/errors.rb @@ -1,4 +1,4 @@ -# Copyright 2015, Google Inc. +# Copyright 2015-2016, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -27,7 +27,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -require 'grpc' +require 'grpc/grpc' # GRPC contains the General RPC module. module GRPC |