diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-03-31 10:19:14 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-03-31 10:19:14 -0230 |
| commit | 523c90a00583915ccb49880ca83ecc35467ed46b (patch) | |
| tree | b748b726573389ec7c9c2ca5fe77e321caf7398e /cpp/src | |
| parent | Bug 3608 - Icestorm.ice does not need to include Identity.ice (diff) | |
| download | ice-523c90a00583915ccb49880ca83ecc35467ed46b.tar.bz2 ice-523c90a00583915ccb49880ca83ecc35467ed46b.tar.xz ice-523c90a00583915ccb49880ca83ecc35467ed46b.zip | |
Bug 3045 - move getInstance() to IceInternal
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/slice2freezej/Main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp index bbd2e4a0ec5..b061dd3d32e 100644 --- a/cpp/src/slice2freezej/Main.cpp +++ b/cpp/src/slice2freezej/Main.cpp @@ -564,7 +564,7 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict) out << sb; out << nl << "assert(o instanceof " << typeS << ");"; out << nl << "IceInternal.BasicStream __os = " - << "new IceInternal.BasicStream(Ice.Util.getInstance(communicator));"; + << "new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator));"; if(encaps) { out << nl << "__os.startWriteEncaps();"; @@ -591,7 +591,7 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict) out << sp << nl << "public Object" << nl << "decode" << keyValue << "(byte[] b, Ice.Communicator communicator)"; out << sb; - out << nl << "IceInternal.BasicStream __is = new IceInternal.BasicStream(Ice.Util.getInstance(communicator));"; + out << nl << "IceInternal.BasicStream __is = new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator));"; if(type->usesClasses()) { out << nl << "__is.sliceObjects(false);"; @@ -729,7 +729,7 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict) keyS = objectToVar(indexTypes[i], keyS); out << nl << "IceInternal.BasicStream __os = " - << "new IceInternal.BasicStream(Ice.Util.getInstance(communicator));"; + << "new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator));"; int iter = 0; writeMarshalUnmarshalCode(out, "", indexTypes[i], keyS, true, iter, false); assert(!indexTypes[i]->usesClasses()); @@ -756,7 +756,7 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict) } else { - out << nl << "IceInternal.BasicStream __is = new IceInternal.BasicStream(Ice.Util.getInstance(communicator));"; + out << nl << "IceInternal.BasicStream __is = new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator));"; out << nl << "__is.resize(bytes.length, true);"; out << nl << "IceInternal.Buffer buf = __is.getBuffer();"; out << nl << "buf.b.position(0);"; @@ -1085,7 +1085,7 @@ FreezeGenerator::generate(UnitPtr& u, const Index& index) << "marshalKey(" << memberTypeString << " __key)"; out << sb; out << nl << "IceInternal.BasicStream __os = " - << "new IceInternal.BasicStream(Ice.Util.getInstance(communicator()));"; + << "new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator()));"; int iter = 0; writeMarshalUnmarshalCode(out, "", dataMember->type(), valueS, true, iter, false); if(type->usesClasses()) |