diff options
Diffstat (limited to 'matlab/lib/+IceInternal')
| -rw-r--r-- | matlab/lib/+IceInternal/EncapsDecoder.m | 10 | ||||
| -rw-r--r-- | matlab/lib/+IceInternal/EncapsDecoder10.m | 4 | ||||
| -rw-r--r-- | matlab/lib/+IceInternal/EncapsDecoder11.m | 4 | ||||
| -rw-r--r-- | matlab/lib/+IceInternal/EncapsEncoder10.m | 2 | ||||
| -rw-r--r-- | matlab/lib/+IceInternal/EncapsEncoder11.m | 2 | ||||
| -rw-r--r-- | matlab/lib/+IceInternal/WrapperObject.m | 24 |
6 files changed, 14 insertions, 32 deletions
diff --git a/matlab/lib/+IceInternal/EncapsDecoder.m b/matlab/lib/+IceInternal/EncapsDecoder.m index 5431ef4bb5f..bf6d2d108bb 100644 --- a/matlab/lib/+IceInternal/EncapsDecoder.m +++ b/matlab/lib/+IceInternal/EncapsDecoder.m @@ -39,11 +39,11 @@ classdef (Abstract) EncapsDecoder < handle % if ~isempty(obj.delayedPostUnmarshal) % - % First call icePostUnmarshal_ on every instance. This allows the generated code to finish its tasks. + % First call icePostUnmarshal on every instance. This allows the generated code to finish its tasks. % for i = 1:length(obj.delayedPostUnmarshal) v = obj.delayedPostUnmarshal{i}; - v.icePostUnmarshal_(); + v.icePostUnmarshal(); end % % Then call ice_postUnmarshal on every instance. This is the application's interception point. @@ -176,7 +176,7 @@ classdef (Abstract) EncapsDecoder < handle % % Read the instance. % - v.iceRead_(obj.is); + v.iceRead(obj.is); if ~isempty(obj.patchMap) && obj.patchMap.isKey(index) % @@ -201,7 +201,7 @@ classdef (Abstract) EncapsDecoder < handle end if (isempty(obj.patchMap) || obj.patchMap.Count == 0) && isempty(obj.valueList) - if v.iceDelayPostUnmarshal_() + if v.iceDelayPostUnmarshal() obj.delayedPostUnmarshal{end + 1} = v; % See finish() else try @@ -223,7 +223,7 @@ classdef (Abstract) EncapsDecoder < handle % for i = 1:length(obj.valueList) p = obj.valueList{i}; - if p.iceDelayPostUnmarshal_() + if p.iceDelayPostUnmarshal() obj.delayedPostUnmarshal{end + 1} = p; % See finish() else try diff --git a/matlab/lib/+IceInternal/EncapsDecoder10.m b/matlab/lib/+IceInternal/EncapsDecoder10.m index eac0a7b5ee6..8723687fcb0 100644 --- a/matlab/lib/+IceInternal/EncapsDecoder10.m +++ b/matlab/lib/+IceInternal/EncapsDecoder10.m @@ -101,11 +101,11 @@ classdef EncapsDecoder10 < IceInternal.EncapsDecoder % % Exceptions are value types so we have to replace 'ex' with its new value after calling methods. % - ex = ex.read_(obj.is); + ex = ex.iceRead(obj.is); if usesClasses obj.readPendingValues(); end - ex = ex.postUnmarshal_(); + ex = ex.icePostUnmarshal(); throw(ex); else % diff --git a/matlab/lib/+IceInternal/EncapsDecoder11.m b/matlab/lib/+IceInternal/EncapsDecoder11.m index 31e9c91458d..21675d20538 100644 --- a/matlab/lib/+IceInternal/EncapsDecoder11.m +++ b/matlab/lib/+IceInternal/EncapsDecoder11.m @@ -97,8 +97,8 @@ classdef EncapsDecoder11 < IceInternal.EncapsDecoder % % Exceptions are value types so we have to replace 'ex' with its new value after calling methods. % - ex = ex.read_(obj.is); - ex = ex.postUnmarshal_(); + ex = ex.iceRead(obj.is); + ex = ex.icePostUnmarshal(); throw(ex); else % diff --git a/matlab/lib/+IceInternal/EncapsEncoder10.m b/matlab/lib/+IceInternal/EncapsEncoder10.m index 5ba9178db3c..6a356e6c2ac 100644 --- a/matlab/lib/+IceInternal/EncapsEncoder10.m +++ b/matlab/lib/+IceInternal/EncapsEncoder10.m @@ -109,7 +109,7 @@ classdef EncapsEncoder10 < IceInternal.EncapsEncoder obj.os.getCommunicator().getLogger().warning(msg); end - v.iceWrite_(obj.os); + v.iceWrite(obj.os); end end obj.os.writeSize(0); % Zero marker indicates end of sequence of sequences of instances. diff --git a/matlab/lib/+IceInternal/EncapsEncoder11.m b/matlab/lib/+IceInternal/EncapsEncoder11.m index b85f8887d18..0eacc9c3439 100644 --- a/matlab/lib/+IceInternal/EncapsEncoder11.m +++ b/matlab/lib/+IceInternal/EncapsEncoder11.m @@ -248,7 +248,7 @@ classdef EncapsEncoder11 < IceInternal.EncapsEncoder end obj.os.writeSize(1); % Class instance marker. - v.iceWrite_(obj.os); + v.iceWrite(obj.os); end end properties(Access=private) diff --git a/matlab/lib/+IceInternal/WrapperObject.m b/matlab/lib/+IceInternal/WrapperObject.m index 125c879958d..81f762bc51a 100644 --- a/matlab/lib/+IceInternal/WrapperObject.m +++ b/matlab/lib/+IceInternal/WrapperObject.m @@ -26,17 +26,17 @@ classdef (Abstract) WrapperObject < handle methods(Hidden) function delete(obj) if ~isempty(obj.impl_) - obj.call_('_release'); + obj.iceCall('unref'); end end - function call_(obj, fn, varargin) + function iceCall(obj, fn, varargin) name = strcat(obj.type_, '_', fn); ex = calllib('icematlab', name, obj.impl_, varargin{:}); if ~isempty(ex) ex.throwAsCaller(); end end - function r = callWithResult_(obj, fn, varargin) + function r = iceCallWithResult(obj, fn, varargin) name = strcat(obj.type_, '_', fn); result = calllib('icematlab', name, obj.impl_, varargin{:}); if isempty(result) @@ -47,24 +47,6 @@ classdef (Abstract) WrapperObject < handle r = result.result; end end - function callOnType_(obj, type, fn, varargin) - name = strcat(type, '_', fn); - ex = calllib('icematlab', name, obj.impl_, varargin{:}); - if ~isempty(ex) - ex.throwAsCaller(); - end - end - function r = callOnTypeWithResult_(obj, type, fn, varargin) - name = strcat(type, '_', fn); - result = calllib('icematlab', name, obj.impl_, varargin{:}); - if isempty(result) - r = result; - elseif ~isempty(result.exception) - result.exception.throwAsCaller(); - else - r = result.result; - end - end end properties(Hidden,SetAccess=protected) impl_ |