1 files changed, 397 insertions, 397 deletions

diff --git a/cpp/demo/Freeze/bench/Client.cpp b/cpp/demo/Freeze/bench/Client.cpp
index 07b95e14f38..67f71de2a2e 100644
--- a/cpp/demo/Freeze/bench/Client.cpp
+++ b/cpp/demo/Freeze/bench/Client.cpp
@@ -36,20 +36,20 @@ public:
     void
     start()
     {
-	_stopped = false;
-	_start = IceUtil::Time::now();
+        _stopped = false;
+        _start = IceUtil::Time::now();
     }
 
     IceUtil::Time
     stop()
     {
-	if(!_stopped)
-	{
-	    _stopped = true;
-	    _stop = IceUtil::Time::now();
-	}
+        if(!_stopped)
+        {
+            _stopped = true;
+            _stop = IceUtil::Time::now();
+        }
 
-	return _stop - _start;
+        return _stop - _start;
     }
 
 private:
@@ -75,23 +75,23 @@ class RandomGenerator : public Generator
 public:
 
     RandomGenerator(int seed, int max) :
-	_max(max)
+        _max(max)
     {
-	srand(seed);
+        srand(seed);
     }
 
     virtual int
     next()
     {
-	return rand() % _max;
+        return rand() % _max;
     }
 
     virtual string
     toString()
     {
-	ostringstream os;
-	os << "random(" << _max << ")";
-	return os.str();
+        ostringstream os;
+        os << "random(" << _max << ")";
+        return os.str();
     }
 
 private:
@@ -104,30 +104,30 @@ class SequentialGenerator : public Generator
 public:
 
     SequentialGenerator(int min, int max) :
-	_min(min),
-	_max(max),
-	_current(0)
+        _min(min),
+        _max(max),
+        _current(0)
     {
     }
 
     virtual int
     next()
     {
-	int n = _current;
-	++_current;
-	if(_current > _max)
-	{
-	    _current = _min;
-	}
-	return n;
+        int n = _current;
+        ++_current;
+        if(_current > _max)
+        {
+            _current = _min;
+        }
+        return n;
     }
 
     virtual string
     toString()
     {
-	ostringstream os;
-	os << ((_max - _min)+1);
-	return os.str();
+        ostringstream os;
+        os << ((_max - _min)+1);
+        return os.str();
     }
 
 private:
@@ -157,68 +157,68 @@ private:
     void IntIntMapIndexTest(IndexedIntIntMap&);
     template<class T> void IntIntMapTest(const string& mapName, T* = 0)
     {
-	T m(_connection, mapName);	
-	//
-	// Populate the database.
-	//
-	int i;
-	_watch.start();
-	{
-	    Freeze::TransactionHolder txHolder(_connection);
-	    for(i = 0; i < _repetitions; ++i)
-	    {
+        T m(_connection, mapName);      
+        //
+        // Populate the database.
+        //
+        int i;
+        _watch.start();
+        {
+            Freeze::TransactionHolder txHolder(_connection);
+            for(i = 0; i < _repetitions; ++i)
+            {
 #if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1310))
-		m.put(T::value_type(i, i));
+                m.put(T::value_type(i, i));
 #else
-		m.put(typename T::value_type(i, i));
+                m.put(typename T::value_type(i, i));
 #endif
-	    }
-	    txHolder.commit();
-	}
-	IceUtil::Time total = _watch.stop();
-	IceUtil::Time perRecord = total / _repetitions;
-
-	cout << "\ttime for " << _repetitions << " writes: " << total * 1000 << "ms" << endl;
-	cout << "\ttime per write: " << perRecord * 1000 << "ms" << endl;
-	
-	//
-	// Read each record.
-	//
-	_watch.start();
-	for(i = 0; i < _repetitions; ++i)
-	{
-	    typename T::iterator p = m.find(i);
-	    test(p != m.end());
-	    test(p->second == i);
-	}
-	total = _watch.stop();
-	perRecord = total / _repetitions;
-	
-	cout << "\ttime for " << _repetitions << " reads: " << total * 1000  << "ms" << endl;
-	cout << "\ttime per read: " << perRecord * 1000 << "ms" << endl;
-	
-	//
-	// Optional index sub-test
-	//
-	IntIntMapIndexTest(m);
-	
-	//
-	// Remove each record.
-	//
-	_watch.start();
-	{
-	    Freeze::TransactionHolder txHolder(_connection);
-	    for(i = 0; i < _repetitions; ++i)
-	    {
-		m.erase(i);
-	    }
-	    txHolder.commit();
-	}
-	total = _watch.stop();
-	perRecord = total / _repetitions;
-	
-	cout << "\ttime for " << _repetitions << " removes: " << total * 1000 << "ms" << endl;
-	cout << "\ttime per remove: " << perRecord * 1000 << "ms" << endl;
+            }
+            txHolder.commit();
+        }
+        IceUtil::Time total = _watch.stop();
+        IceUtil::Time perRecord = total / _repetitions;
+
+        cout << "\ttime for " << _repetitions << " writes: " << total * 1000 << "ms" << endl;
+        cout << "\ttime per write: " << perRecord * 1000 << "ms" << endl;
+        
+        //
+        // Read each record.
+        //
+        _watch.start();
+        for(i = 0; i < _repetitions; ++i)
+        {
+            typename T::iterator p = m.find(i);
+            test(p != m.end());
+            test(p->second == i);
+        }
+        total = _watch.stop();
+        perRecord = total / _repetitions;
+        
+        cout << "\ttime for " << _repetitions << " reads: " << total * 1000  << "ms" << endl;
+        cout << "\ttime per read: " << perRecord * 1000 << "ms" << endl;
+        
+        //
+        // Optional index sub-test
+        //
+        IntIntMapIndexTest(m);
+        
+        //
+        // Remove each record.
+        //
+        _watch.start();
+        {
+            Freeze::TransactionHolder txHolder(_connection);
+            for(i = 0; i < _repetitions; ++i)
+            {
+                m.erase(i);
+            }
+            txHolder.commit();
+        }
+        total = _watch.stop();
+        perRecord = total / _repetitions;
+        
+        cout << "\ttime for " << _repetitions << " removes: " << total * 1000 << "ms" << endl;
+        cout << "\ttime per remove: " << perRecord * 1000 << "ms" << endl;
     }
    
     
@@ -227,22 +227,22 @@ private:
     void generatedReadWithIndex(IndexedIntIntMap&, int, const GeneratorPtr&);
     template<class T> void generatedRead(T& m, int reads , const GeneratorPtr& gen)
     {
-	_watch.start();
-	for(int i = 0; i < reads; ++i)
-	{
-	    int key = gen->next();
-	    typename T::iterator p = m.find(key);
-	    test(p != m.end());
-	    test(p->second == key);
-	}
-	IceUtil::Time total = _watch.stop();
-	IceUtil::Time perRecord = total / reads;
-	
-	cout << "\ttime for " << reads << " reads of " << gen->toString() << " records: " << total * 1000 << "ms"
-	     << endl;
-	cout << "\ttime per read: " << perRecord * 1000 << "ms" << endl;
-	
-	generatedReadWithIndex(m, reads, gen);
+        _watch.start();
+        for(int i = 0; i < reads; ++i)
+        {
+            int key = gen->next();
+            typename T::iterator p = m.find(key);
+            test(p != m.end());
+            test(p->second == key);
+        }
+        IceUtil::Time total = _watch.stop();
+        IceUtil::Time perRecord = total / reads;
+        
+        cout << "\ttime for " << reads << " reads of " << gen->toString() << " records: " << total * 1000 << "ms"
+             << endl;
+        cout << "\ttime per read: " << perRecord * 1000 << "ms" << endl;
+        
+        generatedReadWithIndex(m, reads, gen);
     }
 
     
@@ -251,81 +251,81 @@ private:
     void Struct1Struct2MapIndexTest(IndexedStruct1Struct2Map&);
     template<class T> void Struct1Struct2MapTest(const string& mapName, T* = 0)
     {
-	T m(_connection, mapName);
-	
-	//
-	// Populate the database.
-	//
-	Struct1 s1;
-	Struct2 s2;
-	int i;
-	_watch.start();
-	{
-	    Freeze::TransactionHolder txHolder(_connection);
-	    for(i = 0; i < _repetitions; ++i)
-	    {
-		s1.l = i;
-		ostringstream os;
-		os << i;
-		s2.s = os.str();
-		s2.s1 = s1;
+        T m(_connection, mapName);
+        
+        //
+        // Populate the database.
+        //
+        Struct1 s1;
+        Struct2 s2;
+        int i;
+        _watch.start();
+        {
+            Freeze::TransactionHolder txHolder(_connection);
+            for(i = 0; i < _repetitions; ++i)
+            {
+                s1.l = i;
+                ostringstream os;
+                os << i;
+                s2.s = os.str();
+                s2.s1 = s1;
 
 #if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1310))
-		m.put(T::value_type(s1, s2));
+                m.put(T::value_type(s1, s2));
 #else
-		m.put(typename T::value_type(s1, s2));
+                m.put(typename T::value_type(s1, s2));
 #endif
-	    }
-	    txHolder.commit();
-	}
-	IceUtil::Time total = _watch.stop();
-	IceUtil::Time perRecord = total / _repetitions;
-	
-	cout << "\ttime for " << _repetitions << " writes: " << total * 1000 << "ms" << endl;
-	cout << "\ttime per write: " << perRecord * 1000 << "ms" << endl;
-	
-	//
-	// Read each record.
-	//
-	_watch.start();
-	for(i = 0; i < _repetitions; ++i)
-	{
-	    s1.l = i;
-	    typename T::iterator p = m.find(s1);
-	    test(p != m.end());
-	    ostringstream os;
-	    os << i;
-	    test(p->second.s == os.str());
-	}
-	total = _watch.stop();
-	perRecord = total / _repetitions;
-	
-	cout << "\ttime for " << _repetitions << " reads: " << total * 1000 << "ms" << endl;
-	cout << "\ttime per read: " << perRecord * 1000 << "ms" << endl;
-	
-	//
-	// Optional index test
-	//
-	Struct1Struct2MapIndexTest(m);
-	
-	//
-	// Remove each record.
-	//
-	_watch.start();
-	{
-	    Freeze::TransactionHolder txHolder(_connection);
-	    for(i = 0; i < _repetitions; ++i)
-	    {
-		s1.l = i;
-		m.erase(s1);
-	    }
-	    txHolder.commit();
-	}
-	total = _watch.stop();
-	perRecord = total / _repetitions;
-	
-	cout << "\ttime for " << _repetitions << " removes: " << total * 1000 << "ms" << endl;
-	cout << "\ttime per remove: " << perRecord * 1000 << "ms" << endl;
+            }
+            txHolder.commit();
+        }
+        IceUtil::Time total = _watch.stop();
+        IceUtil::Time perRecord = total / _repetitions;
+        
+        cout << "\ttime for " << _repetitions << " writes: " << total * 1000 << "ms" << endl;
+        cout << "\ttime per write: " << perRecord * 1000 << "ms" << endl;
+        
+        //
+        // Read each record.
+        //
+        _watch.start();
+        for(i = 0; i < _repetitions; ++i)
+        {
+            s1.l = i;
+            typename T::iterator p = m.find(s1);
+            test(p != m.end());
+            ostringstream os;
+            os << i;
+            test(p->second.s == os.str());
+        }
+        total = _watch.stop();
+        perRecord = total / _repetitions;
+        
+        cout << "\ttime for " << _repetitions << " reads: " << total * 1000 << "ms" << endl;
+        cout << "\ttime per read: " << perRecord * 1000 << "ms" << endl;
+        
+        //
+        // Optional index test
+        //
+        Struct1Struct2MapIndexTest(m);
+        
+        //
+        // Remove each record.
+        //
+        _watch.start();
+        {
+            Freeze::TransactionHolder txHolder(_connection);
+            for(i = 0; i < _repetitions; ++i)
+            {
+                s1.l = i;
+                m.erase(s1);
+            }
+            txHolder.commit();
+        }
+        total = _watch.stop();
+        perRecord = total / _repetitions;
+        
+        cout << "\ttime for " << _repetitions << " removes: " << total * 1000 << "ms" << endl;
+        cout << "\ttime per remove: " << perRecord * 1000 << "ms" << endl;
     }
 
    
@@ -334,80 +334,80 @@ private:
     void Struct1Class1MapIndexTest(IndexedStruct1Class1Map&);
     template<class T> void Struct1Class1MapTest(const string& mapName, T* = 0)
     {
-	T m(_connection, mapName);
-	
-	//
-	// Populate the database.
-	//
-	Struct1 s1;
-	Class1Ptr c1 = new Class1();
-	int i;
-	_watch.start();
-	{
-	    Freeze::TransactionHolder txHolder(_connection);
-	    for(i = 0; i < _repetitions; ++i)
-	    {
-		s1.l = i;
-		ostringstream os;
-		os << i;
-		c1->s = os.str();
+        T m(_connection, mapName);
+        
+        //
+        // Populate the database.
+        //
+        Struct1 s1;
+        Class1Ptr c1 = new Class1();
+        int i;
+        _watch.start();
+        {
+            Freeze::TransactionHolder txHolder(_connection);
+            for(i = 0; i < _repetitions; ++i)
+            {
+                s1.l = i;
+                ostringstream os;
+                os << i;
+                c1->s = os.str();
 #if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1310))
-		m.put(T::value_type(s1, c1));
+                m.put(T::value_type(s1, c1));
 #else
-		m.put(typename T::value_type(s1, c1));
+                m.put(typename T::value_type(s1, c1));
 #endif
-	    }
-	    txHolder.commit();
-	}
-	IceUtil::Time total = _watch.stop();
-	IceUtil::Time perRecord = total / _repetitions;
-	
-	cout << "\ttime for " << _repetitions << " writes: " << total * 1000 << "ms" << endl;
-	cout << "\ttime per write: " << perRecord * 1000 << "ms" << endl;
-	
-	//
-	// Read each record.
-	//
-	_watch.start();
-	for(i = 0; i < _repetitions; ++i)
-	{
-	    s1.l = i;
-	    typename T::iterator p = m.find(s1);
-	    test(p != m.end());
-	    ostringstream os;
-	    os << i;
-	    test(p->second->s == os.str());
-	}
-	total = _watch.stop();
-	perRecord = total / _repetitions;
-	
-	cout << "\ttime for " << _repetitions << " reads: " << total * 1000 << "ms" << endl;
-	cout << "\ttime per read: " << perRecord * 1000 << "ms" << endl;
-	
-	//
-	// Optional index test
-	//
-	
-	Struct1Class1MapIndexTest(m);
-	
-	//
-	// Remove each record.
-	//
-	_watch.start();
-	{
-	    Freeze::TransactionHolder txHolder(_connection);
-	    for(i = 0; i < _repetitions; ++i)
-	    {
-		s1.l = i;
-		m.erase(s1);
-	    }
-	    txHolder.commit();
-	}
-	total = _watch.stop();
-	perRecord = total / _repetitions;
-	
-	cout << "\ttime for " << _repetitions << " removes: " << total * 1000 << "ms" << endl;
-	cout << "\ttime per remove: " << perRecord * 1000 << "ms" << endl;
+            }
+            txHolder.commit();
+        }
+        IceUtil::Time total = _watch.stop();
+        IceUtil::Time perRecord = total / _repetitions;
+        
+        cout << "\ttime for " << _repetitions << " writes: " << total * 1000 << "ms" << endl;
+        cout << "\ttime per write: " << perRecord * 1000 << "ms" << endl;
+        
+        //
+        // Read each record.
+        //
+        _watch.start();
+        for(i = 0; i < _repetitions; ++i)
+        {
+            s1.l = i;
+            typename T::iterator p = m.find(s1);
+            test(p != m.end());
+            ostringstream os;
+            os << i;
+            test(p->second->s == os.str());
+        }
+        total = _watch.stop();
+        perRecord = total / _repetitions;
+        
+        cout << "\ttime for " << _repetitions << " reads: " << total * 1000 << "ms" << endl;
+        cout << "\ttime per read: " << perRecord * 1000 << "ms" << endl;
+        
+        //
+        // Optional index test
+        //
+        
+        Struct1Class1MapIndexTest(m);
+        
+        //
+        // Remove each record.
+        //
+        _watch.start();
+        {
+            Freeze::TransactionHolder txHolder(_connection);
+            for(i = 0; i < _repetitions; ++i)
+            {
+                s1.l = i;
+                m.erase(s1);
+            }
+            txHolder.commit();
+        }
+        total = _watch.stop();
+        perRecord = total / _repetitions;
+        
+        cout << "\ttime for " << _repetitions << " removes: " << total * 1000 << "ms" << endl;
+        cout << "\ttime per remove: " << perRecord * 1000 << "ms" << endl;
     }
    
     void IntIntMapReadIndexTest(IntIntMap&)
@@ -415,62 +415,62 @@ private:
     void IntIntMapReadIndexTest(IndexedIntIntMap&);
     template<class T> void IntIntMapReadTest(const string& mapName, T* = 0)
     {
-	T m(_connection, mapName);
-	
-	//
-	// Populate the database.
-	//
-	int i;
-	_watch.start();
-	{
-	    Freeze::TransactionHolder txHolder(_connection);
-	    for(i = 0; i < _repetitions; ++i)
-	    {
+        T m(_connection, mapName);
+        
+        //
+        // Populate the database.
+        //
+        int i;
+        _watch.start();
+        {
+            Freeze::TransactionHolder txHolder(_connection);
+            for(i = 0; i < _repetitions; ++i)
+            {
 #if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1310))
-		m.put(T::value_type(i, i));
+                m.put(T::value_type(i, i));
 #else
-		m.put(typename T::value_type(i, i));
+                m.put(typename T::value_type(i, i));
 #endif
-	    }
-	    txHolder.commit();
-	}
-	IceUtil::Time total = _watch.stop();
-	IceUtil::Time perRecord = total / _repetitions;
-	
-	cout << "\ttime for " << _repetitions << " writes: " << total * 1000 << "ms" << endl;
-	cout << "\ttime per write: " << perRecord * 1000 << "ms" << endl;
-	
-	//
-	// Do some read tests.
-	//
-	generatedRead(m, _repetitions, new SequentialGenerator(1000, 1000));
-	generatedRead(m, _repetitions, new SequentialGenerator(2000, 2009));
-	generatedRead(m, _repetitions, new SequentialGenerator(3000, 3099));
-	generatedRead(m, _repetitions, new SequentialGenerator(4000, 4999));
-	
-	//
-	// Do a random read test.
-	//
-	generatedRead(m, _repetitions, new RandomGenerator(0, 10000));
-	
-	//
-	// Remove each record.
-	//
-	/*
-	 *      For this test I don't want to remove the records because I
-	 *      want to examine the cache stats for the database.
-	 *
-	 _watch.start();
-	 for(i = 0; i < _repetitions; ++i)
-	 {
-	     m.erase(i);
-	 }
-	 total = _watch.stop();
-	 perRecord = total / _repetitions;
-	 
-	 cout << "\ttime for " << _repetitions << " removes: " << total * 1000 << "ms" << endl;
-	 cout << "\ttime per remove: " << perRecord * 1000 << "ms" << endl;
-	*/
+            }
+            txHolder.commit();
+        }
+        IceUtil::Time total = _watch.stop();
+        IceUtil::Time perRecord = total / _repetitions;
+        
+        cout << "\ttime for " << _repetitions << " writes: " << total * 1000 << "ms" << endl;
+        cout << "\ttime per write: " << perRecord * 1000 << "ms" << endl;
+        
+        //
+        // Do some read tests.
+        //
+        generatedRead(m, _repetitions, new SequentialGenerator(1000, 1000));
+        generatedRead(m, _repetitions, new SequentialGenerator(2000, 2009));
+        generatedRead(m, _repetitions, new SequentialGenerator(3000, 3099));
+        generatedRead(m, _repetitions, new SequentialGenerator(4000, 4999));
+        
+        //
+        // Do a random read test.
+        //
+        generatedRead(m, _repetitions, new RandomGenerator(0, 10000));
+        
+        //
+        // Remove each record.
+        //
+        /*
+         *      For this test I don't want to remove the records because I
+         *      want to examine the cache stats for the database.
+         *
+         _watch.start();
+         for(i = 0; i < _repetitions; ++i)
+         {
+             m.erase(i);
+         }
+         total = _watch.stop();
+         perRecord = total / _repetitions;
+         
+         cout << "\ttime for " << _repetitions << " removes: " << total * 1000 << "ms" << endl;
+         cout << "\ttime per remove: " << perRecord * 1000 << "ms" << endl;
+        */
     }
 
    
@@ -497,15 +497,15 @@ TestApp::IntIntMapIndexTest(IndexedIntIntMap& m)
     _watch.start();
     for(int i = 0; i < _repetitions; ++i)
     {
-	IndexedIntIntMap::iterator p = m.findByValue(i);
-	test(p != m.end());
-	test(p->second == i);
+        IndexedIntIntMap::iterator p = m.findByValue(i);
+        test(p != m.end());
+        test(p->second == i);
     }
     IceUtil::Time total = _watch.stop();
     IceUtil::Time perRecord = total / _repetitions;
 
     cout << "\ttime for " << _repetitions << " reverse (indexed) reads: " << total * 1000 << "ms"
-	 << endl;
+         << endl;
     cout << "\ttime per reverse read: " << perRecord * 1000 << "ms" << endl;
 }
 
@@ -515,16 +515,16 @@ TestApp::generatedReadWithIndex(IndexedIntIntMap& m, int reads, const GeneratorP
     _watch.start();
     for(int i = 0; i < reads; ++i)
     {
-	int value = gen->next();
-	IndexedIntIntMap::iterator p = m.findByValue(value);
-	test(p != m.end());
-	test(p->second == value);
+        int value = gen->next();
+        IndexedIntIntMap::iterator p = m.findByValue(value);
+        test(p != m.end());
+        test(p->second == value);
     }
     IceUtil::Time total = _watch.stop();
     IceUtil::Time perRecord = total / reads;
 
     cout << "\ttime for " << reads << " reverse (indexed) reads of " << gen->toString() << " records: "
-	 << total * 1000 << "ms" << endl;
+         << total * 1000 << "ms" << endl;
     cout << "\ttime per reverse read: " << perRecord * 1000 << "ms" << endl;
 }
 
@@ -536,23 +536,23 @@ TestApp::Struct1Struct2MapIndexTest(IndexedStruct1Struct2Map& m)
     _watch.start();
     for(i = 0; i < _repetitions; ++i)
     {
-	ostringstream os;
-	os << i;
+        ostringstream os;
+        os << i;
 
-	IndexedStruct1Struct2Map::iterator p = m.findByS(os.str());
-	test(p != m.end());
-	test(p->first.l == i);
-	test(p->second.s1.l == i);
+        IndexedStruct1Struct2Map::iterator p = m.findByS(os.str());
+        test(p != m.end());
+        test(p->first.l == i);
+        test(p->second.s1.l == i);
     }
     
     for(i = 0; i < _repetitions; ++i)
     {
-	Struct1 s1;
-	s1.l = i;
-	IndexedStruct1Struct2Map::iterator p = m.findByS1(s1);
-	test(p != m.end());
-	test(p->first.l == i);
-	test(p->second.s1.l == i);
+        Struct1 s1;
+        s1.l = i;
+        IndexedStruct1Struct2Map::iterator p = m.findByS1(s1);
+        test(p != m.end());
+        test(p->first.l == i);
+        test(p->second.s1.l == i);
     }
 
     IceUtil::Time total = _watch.stop();
@@ -571,12 +571,12 @@ TestApp::Struct1Class1MapIndexTest(IndexedStruct1Class1Map& m)
     _watch.start();
     for(int i = 0; i < _repetitions; ++i)
     {
-	ostringstream os;
-	os << i;
+        ostringstream os;
+        os << i;
 
-	IndexedStruct1Class1Map::iterator p = m.findByS(os.str());
-	test(p != m.end());
-	test(p->first.l == i);
+        IndexedStruct1Class1Map::iterator p = m.findByS(os.str());
+        test(p != m.end());
+        test(p->first.l == i);
     }
     IceUtil::Time total = _watch.stop();
     IceUtil::Time perRecord = total / _repetitions;
@@ -603,25 +603,25 @@ TestApp::Struct1ObjectMapTest()
     int i;
     _watch.start();
     {
-	Freeze::TransactionHolder txHolder(_connection);
-	for(i = 0; i < _repetitions; ++i)
-	{
-	    s1.l = i;
-	    Ice::ObjectPtr o;
-	    if((i % 2) == 0)
-	    {
-		o = c2;
-	    }
-	    else
-	    {
-		o = c1;
-	    }
-	    ostringstream os;
-	    os << i;
-	    c1->s = os.str();
-	    m.put(Struct1ObjectMap::value_type(s1, o));
-	}
-	txHolder.commit();
+        Freeze::TransactionHolder txHolder(_connection);
+        for(i = 0; i < _repetitions; ++i)
+        {
+            s1.l = i;
+            Ice::ObjectPtr o;
+            if((i % 2) == 0)
+            {
+                o = c2;
+            }
+            else
+            {
+                o = c1;
+            }
+            ostringstream os;
+            os << i;
+            c1->s = os.str();
+            m.put(Struct1ObjectMap::value_type(s1, o));
+        }
+        txHolder.commit();
     }
     IceUtil::Time total = _watch.stop();
     IceUtil::Time perRecord = total / _repetitions;
@@ -635,27 +635,27 @@ TestApp::Struct1ObjectMapTest()
     _watch.start();
     for(i = 0; i < _repetitions; ++i)
     {
-	s1.l = i;
-	Struct1ObjectMap::iterator p = m.find(s1);
-	test(p != m.end());
-	Ice::ObjectPtr o = p->second;
-	Class1Ptr nc1;
-	if((i % 2) == 0)
-	{
-	    Class2Ptr nc2 = Class2Ptr::dynamicCast(o);
-	    test(nc2);
-
-	    test(nc2->rec == nc2);
-	    nc1 = Class1Ptr::dynamicCast(nc2->obj);
-	}
-	else
-	{
-	    nc1 = Class1Ptr::dynamicCast(o);
-	}
-	test(nc1);
-	ostringstream os;
-	os << i;
-	test(nc1->s == os.str());
+        s1.l = i;
+        Struct1ObjectMap::iterator p = m.find(s1);
+        test(p != m.end());
+        Ice::ObjectPtr o = p->second;
+        Class1Ptr nc1;
+        if((i % 2) == 0)
+        {
+            Class2Ptr nc2 = Class2Ptr::dynamicCast(o);
+            test(nc2);
+
+            test(nc2->rec == nc2);
+            nc1 = Class1Ptr::dynamicCast(nc2->obj);
+        }
+        else
+        {
+            nc1 = Class1Ptr::dynamicCast(o);
+        }
+        test(nc1);
+        ostringstream os;
+        os << i;
+        test(nc1->s == os.str());
     }
     total = _watch.stop();
     perRecord = total / _repetitions;
@@ -668,13 +668,13 @@ TestApp::Struct1ObjectMapTest()
     //
     _watch.start();
     {
-	Freeze::TransactionHolder txHolder(_connection);
-	for(i = 0; i < _repetitions; ++i)
-	{
-	    s1.l = i;
-	    m.erase(s1);
-	}
-	txHolder.commit();
+        Freeze::TransactionHolder txHolder(_connection);
+        for(i = 0; i < _repetitions; ++i)
+        {
+            s1.l = i;
+            m.erase(s1);
+        }
+        txHolder.commit();
     }
     total = _watch.stop();
     perRecord = total / _repetitions;
@@ -690,15 +690,15 @@ public:
     Ice::ObjectPtr
     create(const string& type)
     {
-	if(type == "::Class1")
-	{
-	    return new Class1();
-	}
-	else if(type == "::Class2")
-	{
-	    return new Class2();
-	}
-	return 0;
+        if(type == "::Class1")
+        {
+            return new Class1();
+        }
+        else if(type == "::Class2")
+        {
+            return new Class2();
+        }
+        return 0;
     }
     
     void
@@ -709,8 +709,8 @@ public:
     void
     install(const Ice::CommunicatorPtr& communicator)
     {
-	communicator->addObjectFactory(this, "::Class1");
-	communicator->addObjectFactory(this, "::Class2");
+        communicator->addObjectFactory(this, "::Class1");
+        communicator->addObjectFactory(this, "::Class2");
     }
 };
 typedef IceUtil::Handle<MyFactory> MyFactoryPtr;
@@ -729,8 +729,8 @@ TestApp::run(int argc, char* argv[])
     cout << "IntIntMap" << endl;
 #if defined(_MSC_VER) && (_MSC_VER < 1310)
     {
-	IntIntMap* dummy = 0;
-	IntIntMapTest("IntIntMap", dummy);
+        IntIntMap* dummy = 0;
+        IntIntMapTest("IntIntMap", dummy);
     }
 #else
     IntIntMapTest<IntIntMap>("IntIntMap");
@@ -739,8 +739,8 @@ TestApp::run(int argc, char* argv[])
     cout << "IntIntMap with index" << endl;
 #if defined(_MSC_VER) && (_MSC_VER < 1310)
     {
-	IndexedIntIntMap* dummy = 0;
-	IntIntMapTest("IndexedIntIntMap", dummy);
+        IndexedIntIntMap* dummy = 0;
+        IntIntMapTest("IndexedIntIntMap", dummy);
     }
 #else
     IntIntMapTest<IndexedIntIntMap>("IndexedIntIntMap");
@@ -749,8 +749,8 @@ TestApp::run(int argc, char* argv[])
     cout <<"Struct1Struct2Map" << endl;
 #if defined(_MSC_VER) && (_MSC_VER < 1310)
     {
-	Struct1Struct2Map* dummy = 0;
-	Struct1Struct2MapTest("Struct1Struct2Map", dummy);
+        Struct1Struct2Map* dummy = 0;
+        Struct1Struct2MapTest("Struct1Struct2Map", dummy);
     }
 #else
     Struct1Struct2MapTest<Struct1Struct2Map>("Struct1Struct2Map");
@@ -759,8 +759,8 @@ TestApp::run(int argc, char* argv[])
     cout <<"Struct1Struct2Map with index" << endl;
 #if defined(_MSC_VER) && (_MSC_VER < 1310)
     {
-	IndexedStruct1Struct2Map* dummy = 0;
-	Struct1Struct2MapTest("IndexedStruct1Struct2Map", dummy);
+        IndexedStruct1Struct2Map* dummy = 0;
+        Struct1Struct2MapTest("IndexedStruct1Struct2Map", dummy);
     }
 #else
     Struct1Struct2MapTest<IndexedStruct1Struct2Map>("IndexedStruct1Struct2Map");
@@ -769,8 +769,8 @@ TestApp::run(int argc, char* argv[])
     cout <<"Struct1Class1Map" << endl;
 #if defined(_MSC_VER) && (_MSC_VER < 1310)
     {
-	Struct1Class1Map* dummy = 0;
-	Struct1Class1MapTest("Struct1Class1Map", dummy);
+        Struct1Class1Map* dummy = 0;
+        Struct1Class1MapTest("Struct1Class1Map", dummy);
     }
 #else
     Struct1Class1MapTest<Struct1Class1Map>("Struct1Class1Map");
@@ -779,8 +779,8 @@ TestApp::run(int argc, char* argv[])
     cout <<"Struct1Class1Map with index" << endl;
 #if defined(_MSC_VER) && (_MSC_VER < 1310)
     {
-	IndexedStruct1Class1Map* dummy = 0;
-	Struct1Class1MapTest("IndexedStruct1Class1Map", dummy);
+        IndexedStruct1Class1Map* dummy = 0;
+        Struct1Class1MapTest("IndexedStruct1Class1Map", dummy);
     }
 #else
     Struct1Class1MapTest<IndexedStruct1Class1Map>("IndexedStruct1Class1Map");
@@ -795,8 +795,8 @@ TestApp::run(int argc, char* argv[])
     cout <<"IntIntMap (read test)" << endl;
 #if defined(_MSC_VER) && (_MSC_VER < 1310)  
     {
-	IntIntMap* dummy = 0;
-	IntIntMapReadTest("IntIntMap", dummy);
+        IntIntMap* dummy = 0;
+        IntIntMapReadTest("IntIntMap", dummy);
     }
 #else
     IntIntMapReadTest<IntIntMap>("IntIntMap");
@@ -805,8 +805,8 @@ TestApp::run(int argc, char* argv[])
     cout <<"IntIntMap with index(read test)" << endl;
 #if defined(_MSC_VER) && (_MSC_VER < 1310)  
     {
-	IndexedIntIntMap* dummy = 0;
-	IntIntMapReadTest("IndexedIntIntMap", dummy);
+        IndexedIntIntMap* dummy = 0;
+        IntIntMapReadTest("IndexedIntIntMap", dummy);
     }
 #else
     IntIntMapReadTest<IndexedIntIntMap>("IndexedIntIntMap");