summaryrefslogtreecommitdiff
path: root/csharp/src/Ice/ProxyFactory.cs
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-11-10 14:07:23 -0500
committerBernard Normier <bernard@zeroc.com>2016-11-10 14:07:23 -0500
commit4e06be13bf710ec95f5d207c59b90a0584b857b4 (patch)
tree5bff3948e1c2db2809ac03ef8f4aa8ba14d03c3f /csharp/src/Ice/ProxyFactory.cs
parentVisual Studio settings for C++/C# languages (diff)
downloadice-4e06be13bf710ec95f5d207c59b90a0584b857b4.tar.bz2
ice-4e06be13bf710ec95f5d207c59b90a0584b857b4.tar.xz
ice-4e06be13bf710ec95f5d207c59b90a0584b857b4.zip
Replaced all double-underscores in C#
Diffstat (limited to 'csharp/src/Ice/ProxyFactory.cs')
-rw-r--r--csharp/src/Ice/ProxyFactory.cs24
1 files changed, 12 insertions, 12 deletions
diff --git a/csharp/src/Ice/ProxyFactory.cs b/csharp/src/Ice/ProxyFactory.cs
index 11a204f7a10..159468ba8e3 100644
--- a/csharp/src/Ice/ProxyFactory.cs
+++ b/csharp/src/Ice/ProxyFactory.cs
@@ -17,7 +17,7 @@ namespace IceInternal
{
public Ice.ObjectPrx stringToProxy(string str)
{
- Reference r = instance_.referenceFactory().create(str, null);
+ Reference r = _instance.referenceFactory().create(str, null);
return referenceToProxy(r);
}
@@ -26,7 +26,7 @@ namespace IceInternal
if(proxy != null)
{
Ice.ObjectPrxHelperBase h = (Ice.ObjectPrxHelperBase) proxy;
- return h.reference__().ToString();
+ return h.iceReference().ToString();
}
else
{
@@ -36,8 +36,8 @@ namespace IceInternal
public Ice.ObjectPrx propertyToProxy(string prefix)
{
- string proxy = instance_.initializationData().properties.getProperty(prefix);
- Reference r = instance_.referenceFactory().create(proxy, prefix);
+ string proxy = _instance.initializationData().properties.getProperty(prefix);
+ Reference r = _instance.referenceFactory().create(proxy, prefix);
return referenceToProxy(r);
}
@@ -46,7 +46,7 @@ namespace IceInternal
if(proxy != null)
{
Ice.ObjectPrxHelperBase h = (Ice.ObjectPrxHelperBase) proxy;
- return h.reference__().toProperty(prefix);
+ return h.iceReference().toProperty(prefix);
}
else
{
@@ -57,9 +57,9 @@ namespace IceInternal
public Ice.ObjectPrx streamToProxy(Ice.InputStream s)
{
Ice.Identity ident = new Ice.Identity();
- ident.read__(s);
+ ident.iceRead(s);
- Reference r = instance_.referenceFactory().create(ident, s);
+ Reference r = _instance.referenceFactory().create(ident, s);
return referenceToProxy(r);
}
@@ -79,8 +79,8 @@ namespace IceInternal
public int checkRetryAfterException(Ice.LocalException ex, Reference @ref, ref int cnt)
{
- TraceLevels traceLevels = instance_.traceLevels();
- Ice.Logger logger = instance_.initializationData().logger;
+ TraceLevels traceLevels = _instance.traceLevels();
+ Ice.Logger logger = _instance.initializationData().logger;
//
// We don't retry batch requests because the exception might have caused
@@ -233,9 +233,9 @@ namespace IceInternal
//
internal ProxyFactory(Instance instance)
{
- instance_ = instance;
+ _instance = instance;
- string[] arr = instance_.initializationData().properties.getPropertyAsList("Ice.RetryIntervals");
+ string[] arr = _instance.initializationData().properties.getPropertyAsList("Ice.RetryIntervals");
if(arr.Length > 0)
{
@@ -273,7 +273,7 @@ namespace IceInternal
}
}
- private Instance instance_;
+ private Instance _instance;
private int[] _retryIntervals;
}