diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-12-14 14:02:37 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-12-14 14:02:37 -0500 |
| commit | 006bdff840ed5c834a6640c1690844d38cdafff4 (patch) | |
| tree | 8116d1c1bb38b4fc8dc6c6178b0353f1029c0e07 /js/src/Ice/Struct.js | |
| parent | Fixes to JS test scripts and more work on iOS C++ controller (diff) | |
| download | ice-006bdff840ed5c834a6640c1690844d38cdafff4.tar.bz2 ice-006bdff840ed5c834a6640c1690844d38cdafff4.tar.xz ice-006bdff840ed5c834a6640c1690844d38cdafff4.zip | |
Removed or replaced double underscores in Ice for JavaScript
Diffstat (limited to 'js/src/Ice/Struct.js')
| -rw-r--r-- | js/src/Ice/Struct.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/js/src/Ice/Struct.js b/js/src/Ice/Struct.js index 566a3534981..860f2df5795 100644 --- a/js/src/Ice/Struct.js +++ b/js/src/Ice/Struct.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/HashUtil", "../Ice/ArrayUtil", @@ -115,7 +115,7 @@ function memberHashCode(h, e) function hashCode() { - let __h = 5381; + let h = 5381; for(let key in this) { let e = this[key]; @@ -123,9 +123,9 @@ function hashCode() { continue; } - __h = memberHashCode(__h, e); + h = memberHashCode(h, e); } - return __h; + return h; } Ice.Slice.defineStruct = function(obj, legalKeyType, variableLength) @@ -142,7 +142,7 @@ Ice.Slice.defineStruct = function(obj, legalKeyType, variableLength) obj.prototype.hashCode = hashCode; } - if(obj.prototype.__write && obj.prototype.__read) + if(obj.prototype._write && obj.prototype._read) { obj.write = function(os, v) { @@ -154,7 +154,7 @@ Ice.Slice.defineStruct = function(obj, legalKeyType, variableLength) } v = obj.prototype._nullMarshalValue; } - v.__write(os); + v._write(os); }; obj.read = function(is, v) @@ -163,7 +163,7 @@ Ice.Slice.defineStruct = function(obj, legalKeyType, variableLength) { v = new this(); } - v.__read(is); + v._read(is); return v; }; |