From 4e06be13bf710ec95f5d207c59b90a0584b857b4 Mon Sep 17 00:00:00 2001
From: Bernard Normier <bernard@zeroc.com>
Date: Thu, 10 Nov 2016 14:07:23 -0500
Subject: Replaced all double-underscores in C#

---
 csharp/src/Ice/ObjectAdapterFactory.cs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'csharp/src/Ice/ObjectAdapterFactory.cs')

diff --git a/csharp/src/Ice/ObjectAdapterFactory.cs b/csharp/src/Ice/ObjectAdapterFactory.cs
index 5fba2d4db52..88c49c3c042 100644
--- a/csharp/src/Ice/ObjectAdapterFactory.cs
+++ b/csharp/src/Ice/ObjectAdapterFactory.cs
@@ -25,14 +25,14 @@ namespace IceInternal
                 // Ignore shutdown requests if the object adapter factory has
                 // already been shut down.
                 //
-                if(instance_ == null)
+                if(_instance == null)
                 {
                     return;
                 }
 
                 adapters = new List<Ice.ObjectAdapterI>(_adapters);
                 
-                instance_ = null;
+                _instance = null;
                 _communicator = null;
                 
                 System.Threading.Monitor.PulseAll(this);
@@ -56,7 +56,7 @@ namespace IceInternal
                 //
                 // First we wait for the shutdown of the factory itself.
                 //
-                while(instance_ != null)
+                while(_instance != null)
                 {
                     System.Threading.Monitor.Wait(this);
                 }
@@ -77,7 +77,7 @@ namespace IceInternal
         {
             lock(this)
             {
-                return instance_ == null;
+                return _instance == null;
             }
         }
 
@@ -139,7 +139,7 @@ namespace IceInternal
         {
             lock(this)
             {
-                if(instance_ == null)
+                if(_instance == null)
                 {
                     throw new Ice.CommunicatorDestroyedException();
                 }
@@ -148,7 +148,7 @@ namespace IceInternal
                 if(name.Length == 0)
                 {
                     string uuid = System.Guid.NewGuid().ToString();
-                    adapter = new Ice.ObjectAdapterI(instance_, _communicator, this, uuid, null, true);
+                    adapter = new Ice.ObjectAdapterI(_instance, _communicator, this, uuid, null, true);
                 }
                 else
                 {
@@ -159,7 +159,7 @@ namespace IceInternal
                         ex.id = name;
                         throw ex;
                     }
-                    adapter = new Ice.ObjectAdapterI(instance_, _communicator, this, name, router, false);
+                    adapter = new Ice.ObjectAdapterI(_instance, _communicator, this, name, router, false);
                     _adapterNamesInUse.Add(name);
                 }
                 _adapters.Add(adapter);
@@ -172,7 +172,7 @@ namespace IceInternal
             List<Ice.ObjectAdapterI> adapters;
             lock(this)
             {
-                if(instance_ == null)
+                if(_instance == null)
                 {
                     return null;
                 }
@@ -202,7 +202,7 @@ namespace IceInternal
         {
             lock(this)
             {
-                if(instance_ == null)
+                if(_instance == null)
                 {
                     return;
                 }
@@ -231,13 +231,13 @@ namespace IceInternal
         //
         internal ObjectAdapterFactory(Instance instance, Ice.Communicator communicator)
         {
-            instance_ = instance;
+            _instance = instance;
             _communicator = communicator;
             _adapterNamesInUse = new HashSet<string>();
             _adapters = new List<Ice.ObjectAdapterI>();
         }
         
-        private Instance instance_;
+        private Instance _instance;
         private Ice.Communicator _communicator;
         private HashSet<string> _adapterNamesInUse;
         private List<Ice.ObjectAdapterI> _adapters;
-- 
cgit v1.2.3