Merge remote-tracking branch 'origin/encoding11' into mx

Conflicts:
	cpp/src/Ice/OutgoingAsync.cpp

73 files changed, 582 insertions, 1388 deletions

diff --git a/cpp/src/Freeze/EvictorI.h b/cpp/src/Freeze/EvictorI.h
index 5a1ca1f55af..eb42dbb5951 100755
--- a/cpp/src/Freeze/EvictorI.h
+++ b/cpp/src/Freeze/EvictorI.h
@@ -218,12 +218,7 @@ protected:
                     facetType = ft->second;
                 }
                 ObjectStore<T>* store = new ObjectStore<T>(facet, facetType,_createDb, this, storeIndices, populateEmptyIndices);
-
-#if (defined(_MSC_VER) && (_MSC_VER < 1300))
-                _storeMap.insert(StoreMap::value_type(facet, store));
-#else
                 _storeMap.insert(typename StoreMap::value_type(facet, store));
-#endif
             }
         }
     
@@ -234,11 +229,8 @@ protected:
             {
                 facet = "";
             }
-#if (defined(_MSC_VER) && (_MSC_VER < 1300))
-            std::pair<StoreMap::iterator, bool> ir = 
-                _storeMap.insert(StoreMap::value_type(facet, 0));
-#elif (defined(_MSC_VER) && (_MSC_VER >= 1600))
-	    std::pair<typename StoreMap::iterator, bool> ir = 
+#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
+            std::pair<typename StoreMap::iterator, bool> ir = 
                 _storeMap.insert(typename StoreMap::value_type(facet, nullptr));
 #else
             std::pair<typename StoreMap::iterator, bool> ir = 
@@ -279,12 +271,7 @@ protected:
                 facetType = q->second;
             }
             os = new ObjectStore<T>(facet, facetType, true, this);
-
-#if (defined(_MSC_VER) && (_MSC_VER < 1300))
-            _storeMap.insert(StoreMap::value_type(facet, os));
-#else
             _storeMap.insert(typename StoreMap::value_type(facet, os));
-#endif
         }
         return os;
     }
diff --git a/cpp/src/Freeze/Makefile.mak b/cpp/src/Freeze/Makefile.mak
index 455d2f9b465..a2611f0289f 100644
--- a/cpp/src/Freeze/Makefile.mak
+++ b/cpp/src/Freeze/Makefile.mak
@@ -57,11 +57,7 @@ LINKWITH	= $(LIBS) $(DB_LIBS)
 PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)

 !endif

 

-!if "$(BCPLUSPLUS)" == "yes"

-RES_FILE        = ,, Freeze.res

-!else

 RES_FILE        = Freeze.res

-!endif

 

 $(LIBNAME): $(DLLNAME)

 

@@ -105,13 +101,7 @@ install:: all
 	copy $(LIBNAME) "$(install_libdir)"

 	copy $(DLLNAME) "$(install_bindir)"

 

-

-!if "$(BCPLUSPLUS)" == "yes" && "$(OPTIMIZE)" != "yes"

-

-install:: all

-	copy $(DLLNAME:.dll=.tds) "$(install_bindir)"

-

-!elseif "$(GENERATE_PDB)" == "yes"

+!if "$(GENERATE_PDB)" == "yes"

 

 install:: all

 	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"

diff --git a/cpp/src/FreezeScript/Data.cpp b/cpp/src/FreezeScript/Data.cpp
index 5380f74110f..c92d9c2088b 100644
--- a/cpp/src/FreezeScript/Data.cpp
+++ b/cpp/src/FreezeScript/Data.cpp
@@ -839,11 +839,7 @@ FreezeScript::IntegerData::toString(Ice::Long value)
 {
     char buf[64];
 #ifdef _WIN32
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
     sprintf_s(buf, "%I64d", value);
-#else
-    sprintf(buf, "%I64d", value);
-#endif
 #elif defined(ICE_64)
     sprintf(buf, "%ld", value);
 #else
diff --git a/cpp/src/FreezeScript/Exception.cpp b/cpp/src/FreezeScript/Exception.cpp
index 79f9efdff56..ba2f0a353d4 100644
--- a/cpp/src/FreezeScript/Exception.cpp
+++ b/cpp/src/FreezeScript/Exception.cpp
@@ -34,11 +34,7 @@ FreezeScript::FailureException::ice_name() const
 void
 FreezeScript::FailureException::ice_print(ostream& out) const
 {
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
-    Exception::ice_print(out);
-#else
     ::IceUtil::Exception::ice_print(out);
-#endif
     out << ":\nerror occurred during transformation"; // TODO
     if(!_reason.empty())
     {
diff --git a/cpp/src/FreezeScript/Makefile.mak b/cpp/src/FreezeScript/Makefile.mak
index 94c3fb12016..2d41a1b864a 100644
--- a/cpp/src/FreezeScript/Makefile.mak
+++ b/cpp/src/FreezeScript/Makefile.mak
@@ -47,13 +47,8 @@ TPDBFLAGS        = /pdb:$(TRANSFORMDB:.exe=.pdb)
 DPDBFLAGS        = /pdb:$(DUMPDB:.exe=.pdb)

 !endif

 

-!if "$(BCPLUSPLUS)" == "yes"

-TRES_FILE        = ,, TransformDB.res

-DRES_FILE        = ,, DumpDB.res

-!else

 TRES_FILE        = TransformDB.res

 DRES_FILE        = DumpDB.res

-!endif

 

 $(TRANSFORMDB): $(TRANSFORM_OBJS) $(COMMON_OBJS) TransformDB.res

 	$(LINK) $(LD_EXEFLAGS) $(TPDBFLAGS) $(TRANSFORM_OBJS) $(COMMON_OBJS) $(SETARGV) $(PREOUT)$@ \

@@ -70,8 +65,7 @@ $(DUMPDB): $(DUMP_OBJS) $(COMMON_OBJS) DumpDB.res
 Scanner.cpp : Scanner.l

 	flex Scanner.l

 	del /q $@

-	echo #include "IceUtil/Config.h" > Scanner.cpp

-	echo #include "stdint.h" >> Scanner.cpp

+	echo #include "IceUtil/ScannerConfig.h" >> Scanner.cpp

 	type lex.yy.c >> Scanner.cpp

 	del /q lex.yy.c

 

@@ -91,14 +85,7 @@ install:: all
 	copy $(TRANSFORMDB) "$(install_bindir)"

 	copy $(DUMPDB) "$(install_bindir)"

 

-

-!if "$(BCPLUSPLUS)" == "yes" && "$(OPTIMIZE)" != "yes"

-

-install:: all

-	copy $(TRANSFORMDB:.exe=.tds) "$(install_bindir)"

-	copy $(DUMPDB:.exe=.tds) "$(install_bindir)"

-

-!elseif "$(GENERATE_PDB)" == "yes"

+!if "$(GENERATE_PDB)" == "yes"

 

 install:: all

 	copy $(TRANSFORMDB:.exe=.pdb) "$(install_bindir)"

diff --git a/cpp/src/FreezeScript/Parser.cpp b/cpp/src/FreezeScript/Parser.cpp
index 287b94b706c..7bc5e70a5d9 100644
--- a/cpp/src/FreezeScript/Parser.cpp
+++ b/cpp/src/FreezeScript/Parser.cpp
@@ -166,11 +166,7 @@ FreezeScript::EvaluateException::ice_name() const
 void
 FreezeScript::EvaluateException::ice_print(ostream& out) const
 {
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
-    Exception::ice_print(out);
-#else
     Ice::Exception::ice_print(out);
-#endif
     out << ":\nerror occurred while evaluating expression";
     if(!_reason.empty())
     {
diff --git a/cpp/src/FreezeScript/Scanner.cpp b/cpp/src/FreezeScript/Scanner.cpp
index f5cdbaf7f81..6b9c34b3314 100644
--- a/cpp/src/FreezeScript/Scanner.cpp
+++ b/cpp/src/FreezeScript/Scanner.cpp
@@ -1,5 +1,4 @@
-#include <IceUtil/Config.h>
-#include <stdint.h>
+#include <IceUtil/ScannerConfig.h>
 #line 2 "lex.yy.c"
 
 #line 4 "lex.yy.c"
diff --git a/cpp/src/Glacier2Lib/Makefile.mak b/cpp/src/Glacier2Lib/Makefile.mak
index 3237d9ebc8b..f5469f29f5d 100644
--- a/cpp/src/Glacier2Lib/Makefile.mak
+++ b/cpp/src/Glacier2Lib/Makefile.mak
@@ -34,11 +34,7 @@ CPPFLAGS	= -I.. $(CPPFLAGS) -DGLACIER2_API_EXPORTS -DWIN32_LEAN_AND_MEAN
 PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)

 !endif

 

-!if "$(BCPLUSPLUS)" == "yes"

-RES_FILE        = ,, Glacier2.res

-!else

 RES_FILE        = Glacier2.res

-!endif

 

 SLICE2CPPFLAGS	= --include-dir Glacier2 --dll-export GLACIER2_API $(SLICE2CPPFLAGS)

 

@@ -64,13 +60,7 @@ install:: all
 	copy $(LIBNAME) "$(install_libdir)"

 	copy $(DLLNAME) "$(install_bindir)"

 

-

-!if "$(BCPLUSPLUS)" == "yes" && "$(OPTIMIZE)" != "yes"

-

-install:: all

-	copy $(DLLNAME:.dll=.tds) "$(install_bindir)"

-

-!elseif "$(GENERATE_PDB)" == "yes"

+!if "$(GENERATE_PDB)" == "yes"

 

 install:: all

 	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"

diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp
index 801b4de1a5a..046cc984d11 100644
--- a/cpp/src/Glacier2Lib/SessionHelper.cpp
+++ b/cpp/src/Glacier2Lib/SessionHelper.cpp
@@ -7,6 +7,7 @@
 //
 // **********************************************************************
 
+#include <IceUtil/DisableWarnings.h>
 #include <Glacier2/SessionHelper.h>
 
 #include <IceUtil/UUID.h>
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index aab937b5573..3759ca19abe 100755
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -50,15 +50,9 @@ struct RandomNumberGenerator : public std::unary_function<ptrdiff_t, ptrdiff_t>
 template <typename K, typename V> void
 remove(multimap<K, V>& m, K k, V v)
 {
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-    pair<multimap<K, V>::iterator, multimap<K, V>::iterator> pr = m.equal_range(k);
-    assert(pr.first != pr.second);
-    for(multimap<K, V>::iterator q = pr.first; q != pr.second; ++q)
-#else
     pair<typename multimap<K, V>::iterator, typename multimap<K, V>::iterator> pr = m.equal_range(k);
     assert(pr.first != pr.second);
     for(typename multimap<K, V>::iterator q = pr.first; q != pr.second; ++q)
-#endif
     {
         if(q->second.get() == v.get())
         {
@@ -74,15 +68,9 @@ find(const multimap<K,::IceInternal::Handle<V> >& m,
      K k, 
      const ::IceUtilInternal::ConstMemFun<bool, V, ::IceInternal::Handle<V> >& predicate)
 {
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-    pair<multimap<K, ::IceInternal::Handle<V> >::const_iterator, 
-         multimap<K, ::IceInternal::Handle<V> >::const_iterator> pr = m.equal_range(k);
-    for(multimap<K, ::IceInternal::Handle<V> >::const_iterator q = pr.first; q != pr.second; ++q)
-#else
     pair<typename multimap<K, ::IceInternal::Handle<V> >::const_iterator, 
          typename multimap<K, ::IceInternal::Handle<V> >::const_iterator> pr = m.equal_range(k);
     for(typename multimap<K, ::IceInternal::Handle<V> >::const_iterator q = pr.first; q != pr.second; ++q)
-#endif
     {
         if(predicate(q->second))
         {
@@ -109,17 +97,10 @@ IceInternal::OutgoingConnectionFactory::destroy()
     {
         return;
     }
-
-#ifdef _STLP_BEGIN_NAMESPACE
-    // voidbind2nd is an STLport extension for broken compilers in IceUtil/Functional.h
-    for_each(_connections.begin(), _connections.end(),
-             voidbind2nd(Ice::secondVoidMemFun1<ConnectorPtr, ConnectionI, ConnectionI::DestructionReason>
-                         (&ConnectionI::destroy), ConnectionI::CommunicatorDestroyed));
-#else
+    
     for_each(_connections.begin(), _connections.end(),
              bind2nd(Ice::secondVoidMemFun1<const ConnectorPtr, ConnectionI, ConnectionI::DestructionReason>
                      (&ConnectionI::destroy), ConnectionI::CommunicatorDestroyed));
-#endif
 
     _destroyed = true;
     _communicator = 0;
@@ -1736,15 +1717,8 @@ IceInternal::IncomingConnectionFactory::setState(State state)
                 _acceptor->close();
             }
 #endif
-
-#ifdef _STLP_BEGIN_NAMESPACE
-            // voidbind2nd is an STLport extension for broken compilers in IceUtil/Functional.h
-            for_each(_connections.begin(), _connections.end(),
-                     voidbind2nd(Ice::voidMemFun1(&ConnectionI::destroy), ConnectionI::ObjectAdapterDeactivated));
-#else
             for_each(_connections.begin(), _connections.end(),
                      bind2nd(Ice::voidMemFun1(&ConnectionI::destroy), ConnectionI::ObjectAdapterDeactivated));
-#endif
             break;
         }
 
diff --git a/cpp/src/Ice/DefaultsAndOverrides.cpp b/cpp/src/Ice/DefaultsAndOverrides.cpp
index 43e654463f8..7914e17a5a1 100644
--- a/cpp/src/Ice/DefaultsAndOverrides.cpp
+++ b/cpp/src/Ice/DefaultsAndOverrides.cpp
@@ -7,6 +7,7 @@
 //
 // **********************************************************************
 
+#include <IceUtil/DisableWarnings.h>
 #include <Ice/DefaultsAndOverrides.h>
 #include <Ice/Properties.h>
 #include <Ice/Network.h>
diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp
index 9d5442d6409..15c78d1fcd7 100644
--- a/cpp/src/Ice/LocatorInfo.cpp
+++ b/cpp/src/Ice/LocatorInfo.cpp
@@ -7,6 +7,7 @@
 //
 // **********************************************************************
 
+#include <IceUtil/DisableWarnings.h>
 #include <Ice/LocatorInfo.h>
 #include <Ice/Locator.h>
 #include <Ice/LocalException.h>
diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak
index f3bc4c18258..522da39075e 100644
--- a/cpp/src/Ice/Makefile.mak
+++ b/cpp/src/Ice/Makefile.mak
@@ -122,20 +122,13 @@ CPPFLAGS	= -I.. $(CPPFLAGS) -DICE_API_EXPORTS -DWIN32_LEAN_AND_MEAN
 CPPFLAGS	= $(CPPFLAGS) -DCOMPSUFFIX=\"$(COMPSUFFIX)\"

 !endif

 SLICE2CPPFLAGS	= --ice --include-dir Ice --dll-export ICE_API $(SLICE2CPPFLAGS)

-LINKWITH        = $(BASELIBS) $(BZIP2_LIBS) $(ICE_OS_LIBS) ws2_32.lib

-#!if "$(BCPLUSPLUS)" != "yes"

-LINKWITH	= $(LINKWITH) Iphlpapi.lib

-#!endif

-

-!if "$(BCPLUSPLUS)" == "yes"

-RES_FILE	= ,, Ice.res

-!else

-!if "$(GENERATE_PDB)" == "yes"

+LINKWITH        = $(BASELIBS) $(BZIP2_LIBS) $(ICE_OS_LIBS) ws2_32.lib Iphlpapi.lib

+

+

 PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)

-!endif

 LD_DLLFLAGS	= $(LD_DLLFLAGS) /entry:"ice_DLL_Main"

 RES_FILE	= Ice.res

-!endif

+

 

 $(LIBNAME): $(DLLNAME)

 

@@ -201,13 +194,7 @@ install:: all
 	copy $(LIBNAME) "$(install_libdir)"

 	copy $(DLLNAME) "$(install_bindir)"

 

-

-!if "$(BCPLUSPLUS)" == "yes" && "$(OPTIMIZE)" != "yes"

-

-install:: all

-	copy $(DLLNAME:.dll=.tds) "$(install_bindir)"

-

-!elseif "$(GENERATE_PDB)" == "yes"

+!if "$(GENERATE_PDB)" == "yes"

 

 install:: all

 	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"

diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp
index 5463c2d2377..a86f23f2834 100644
--- a/cpp/src/Ice/Network.cpp
+++ b/cpp/src/Ice/Network.cpp
@@ -17,14 +17,7 @@
 #  include <netinet/in.h>
 #endif
 
-//
-// The following is required for the Vista PSDK to bring in
-// the definitions of the IN6_IS_ADDR_* macros.
-//
-#if defined(_WIN32) && !defined(_WIN32_WINNT) && WINAPI_FAMILY != 0x02
-#       define _WIN32_WINNT 0x0501
-#endif
-
+#include <IceUtil/DisableWarnings.h>
 #include <Ice/Network.h>
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/Unicode.h>
@@ -2237,11 +2230,7 @@ IceInternal::doConnectAsync(SOCKET fd, const Address& addr, AsyncInfo& info)
     }        
 
     if(!ConnectEx(fd, reinterpret_cast<const struct sockaddr*>(&addr), size, 0, 0, 0, 
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // COMPILER FIX: VC60
-                  reinterpret_cast<LPOVERLAPPED>(&info)
-#else
                   &info
-#endif
                   ))
     {
         if(!connectInProgress())
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp
index 8bb137ef68f..3a158848376 100644
--- a/cpp/src/Ice/OutgoingAsync.cpp
+++ b/cpp/src/Ice/OutgoingAsync.cpp
@@ -7,6 +7,7 @@
 //
 // **********************************************************************
 
+#include <IceUtil/DisableWarnings.h>
 #include <Ice/OutgoingAsync.h>
 #include <Ice/Object.h>
 #include <Ice/ConnectionI.h>
@@ -524,11 +525,7 @@ IceInternal::OutgoingAsync::__sent(Ice::ConnectionI* connection)
 void
 IceInternal::OutgoingAsync::__sent()
 {
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
-    AsyncResult::__sent();
-#else
     ::Ice::AsyncResult::__sent();
-#endif
     if(!_proxy->ice_isTwoway())
     {
         _observer.detach();
@@ -901,11 +898,7 @@ IceInternal::BatchOutgoingAsync::__sent(Ice::ConnectionI* connection)
 void
 IceInternal::BatchOutgoingAsync::__sent()
 {
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
-    AsyncResult::__sent();
-#else
     ::Ice::AsyncResult::__sent();
-#endif
 }
 
 void
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index a1fe9f11909..f2e20d3ee50 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -47,14 +47,6 @@ const string ice_flushBatchRequests_name = "ice_flushBatchRequests";
 ::Ice::ObjectPrx
 IceInternal::checkedCastImpl(const ObjectPrx& b, const string& f, const string& typeId, const Context* context)
 {
-//
-// COMPILERBUG: Without this work-around, release VC7.0 and VC7.1
-// build crash when FacetNotExistException is raised
-//
-#if defined(_MSC_VER) && (_MSC_VER >= 1300) && (_MSC_VER <= 1310)
-    ObjectPrx fooBar;
-#endif
-
     if(b)
     {
         ObjectPrx bb = b->ice_facet(f);
diff --git a/cpp/src/Ice/Selector.cpp b/cpp/src/Ice/Selector.cpp
index aadf85a1114..1bcaed5b087 100644
--- a/cpp/src/Ice/Selector.cpp
+++ b/cpp/src/Ice/Selector.cpp
@@ -161,13 +161,7 @@ Selector::update(EventHandler* handler, SocketOperation remove, SocketOperation
 
     if(info)
     {
-        if(!PostQueuedCompletionStatus(_handle, 0, reinterpret_cast<ULONG_PTR>(handler), 
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // COMPILER FIX: VC60
-                                       reinterpret_cast<LPOVERLAPPED>(info)
-#else
-                                       info
-#endif
-                                       ))
+        if(!PostQueuedCompletionStatus(_handle, 0, reinterpret_cast<ULONG_PTR>(handler), info))
         {
             Ice::SocketException ex(__FILE__, __LINE__);
             ex.error = GetLastError();
@@ -209,12 +203,7 @@ Selector::getNextHandler(SocketOperation& status, int timeout)
                 abort();
             }
         }
-
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // COMPILER FIX: VC60
-        AsyncInfo* info = reinterpret_cast<AsyncInfo*>(ol);
-#else
         AsyncInfo* info = static_cast<AsyncInfo*>(ol);
-#endif
         status = info->status;
         info->count = SOCKET_ERROR;
         info->error = WSAGetLastError();
@@ -222,11 +211,7 @@ Selector::getNextHandler(SocketOperation& status, int timeout)
     }
 
     assert(ol);
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // COMPILER FIX: VC60
-    AsyncInfo* info = reinterpret_cast<AsyncInfo*>(ol);
-#else
     AsyncInfo* info = static_cast<AsyncInfo*>(ol);
-#endif
     status = info->status;
     info->count = count;
     info->error = 0;
diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp
index 196e31ae6b7..7800b392076 100644
--- a/cpp/src/Ice/Service.cpp
+++ b/cpp/src/Ice/Service.cpp
@@ -1192,11 +1192,7 @@ Ice::Service::startService(const string& name, const vector<string>& args)
     int i = 0;
     for(vector<string>::const_iterator p = args.begin(); p != args.end(); ++p)
     {
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
        argv[i++] = _strdup(p->c_str());
-#else
-       argv[i++] = strdup(p->c_str());
-#endif
     }
 
     //
diff --git a/cpp/src/Ice/TcpAcceptor.cpp b/cpp/src/Ice/TcpAcceptor.cpp
index 8453863a25b..190648e0755 100644
--- a/cpp/src/Ice/TcpAcceptor.cpp
+++ b/cpp/src/Ice/TcpAcceptor.cpp
@@ -106,13 +106,7 @@ IceInternal::TcpAcceptor::startAccept()
     assert(_acceptFd == INVALID_SOCKET);
     _acceptFd = createSocket(false, _addr);
     const int sz = static_cast<int>(_acceptBuf.size() / 2);
-    if(!AcceptEx(_fd, _acceptFd, &_acceptBuf[0], 0, sz, sz, &_info.count, 
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // COMPILER FIX: VC60
-                 reinterpret_cast<LPOVERLAPPED>(&_info)
-#else
-                 &_info
-#endif
-                 ))
+    if(!AcceptEx(_fd, _acceptFd, &_acceptBuf[0], 0, sz, sz, &_info.count, &_info))
     {
         if(!wouldBlock())
         {
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index 9155b5b5094..3f37c88b024 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -7,14 +7,6 @@
 //
 // **********************************************************************
 
-//
-// The following is required to bring in some definitions. Don't
-// define with Metro Style apps.
-//
-#if defined(_WIN32) && !defined(_WIN32_WINNT) && WINAPI_FAMILY != 0x02
-#       define _WIN32_WINNT 0x0501
-#endif
-
 #include <Ice/ThreadPool.h>
 #include <IceUtil/DisableWarnings.h>
 #include <Ice/EventHandler.h>
@@ -334,13 +326,7 @@ void
 IceInternal::ThreadPoolWorkQueue::postMessage()
 {
 #if defined(ICE_USE_IOCP)
-    if(!PostQueuedCompletionStatus(_selector.getIOCPHandle(), 0, reinterpret_cast<ULONG_PTR>(this),
-#   if defined(_MSC_VER) && (_MSC_VER < 1300) // COMPILER FIX: VC60
-                                   reinterpret_cast<LPOVERLAPPED>(&_info)
-#   else
-                                   &_info
-#   endif
-                                   ))
+    if(!PostQueuedCompletionStatus(_selector.getIOCPHandle(), 0, reinterpret_cast<ULONG_PTR>(this), &_info))
     {
         SocketException ex(__FILE__, __LINE__);
         ex.error = GetLastError();
diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h
index 73e3bc1e2d1..f3ae7c68283 100644
--- a/cpp/src/Ice/ThreadPool.h
+++ b/cpp/src/Ice/ThreadPool.h
@@ -351,7 +351,7 @@ public:
             // of the event handler. We need to lock the event handler here to call 
             // finishMessage.
             //
-#if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER < 1300))
+#if defined(__MINGW32__)
             IceUtil::LockT<T> sync(_mutex);
 #else
             IceUtil::LockT<typename T> sync(_mutex);
diff --git a/cpp/src/Ice/winrt/Makefile.mak b/cpp/src/Ice/winrt/Makefile.mak
index 14e374b8710..a0b71c11842 100644
--- a/cpp/src/Ice/winrt/Makefile.mak
+++ b/cpp/src/Ice/winrt/Makefile.mak
@@ -87,6 +87,7 @@ OBJS		= $(ARCH)\$(CONFIG)\Acceptor.obj \
 		  $(ARCH)\$(CONFIG)\ServantManager.obj \
 		  $(ARCH)\$(CONFIG)\SliceChecksumDict.obj \
 		  $(ARCH)\$(CONFIG)\SliceChecksums.obj \
+		  $(ARCH)\$(CONFIG)\SlicedData.obj \
 		  $(ARCH)\$(CONFIG)\Stats.obj \
 		  $(ARCH)\$(CONFIG)\StreamI.obj \
 		  $(ARCH)\$(CONFIG)\Stream.obj \
@@ -97,7 +98,8 @@ OBJS		= $(ARCH)\$(CONFIG)\Acceptor.obj \
 		  $(ARCH)\$(CONFIG)\Transceiver.obj \
 		  $(ARCH)\$(CONFIG)\UdpConnector.obj \
 		  $(ARCH)\$(CONFIG)\UdpEndpointI.obj \
-		  $(ARCH)\$(CONFIG)\UdpTransceiver.obj
+		  $(ARCH)\$(CONFIG)\UdpTransceiver.obj \
+		  $(ARCH)\$(CONFIG)\Version.obj
 
 LOCAL_OBJS	= $(ARCH)\$(CONFIG)\StreamAcceptor.obj \
 		  $(ARCH)\$(CONFIG)\StreamConnector.obj \
@@ -140,7 +142,8 @@ SLICE_CORE_SRCS	= $(slicedir)\Ice\BuiltinSequences.ice \
 		  $(slicedir)\Ice\ServantLocator.ice \
 		  $(slicedir)\Ice\SliceChecksumDict.ice \
 		  $(slicedir)\Ice\StatsF.ice \
-		  $(slicedir)\Ice\Stats.ice
+		  $(slicedir)\Ice\Stats.ice \
+		  $(slicedir)\Ice\Version.ice
 
 SLICE_SSL_SRCS	= $(slicedir)\IceSSL\EndpointInfo.ice \
 		  $(slicedir)\IceSSL\ConnectionInfo.ice
diff --git a/cpp/src/Ice/winrt/StreamEndpointI.cpp b/cpp/src/Ice/winrt/StreamEndpointI.cpp
index c32a2308974..1f1c030f84e 100644
--- a/cpp/src/Ice/winrt/StreamEndpointI.cpp
+++ b/cpp/src/Ice/winrt/StreamEndpointI.cpp
@@ -32,8 +32,9 @@ template<class T> class InfoI : public T
 {
 public:
     
-    InfoI(Ice::Short type, Ice::Int to, bool comp, const string& host, Ice::Int port) :
-        T(to, comp, host, port), _type(type)
+    InfoI(const ProtocolVersion& pv, const EncodingVersion& ev, Ice::Short type, Ice::Int to, bool comp, 
+           const string& host, Ice::Int port) :
+        T(pv, ev, to, comp, host, port), _type(type)
     {
     }
     
@@ -202,9 +203,7 @@ IceInternal::StreamEndpointI::StreamEndpointI(const InstancePtr& instance, Ice::
 
             default:
             {
-                EndpointParseException ex(__FILE__, __LINE__);
-                ex.str = "unknown option `" + option + "' in `" + typeToString(_type) + " " + str + "'";
-                throw ex;
+                parseOption(option, argument, typeToString(_type), str);
             }
         }
     }
@@ -240,6 +239,16 @@ IceInternal::StreamEndpointI::StreamEndpointI(BasicStream* s, Ice::Short type) :
     s->read(const_cast<Int&>(_port));
     s->read(const_cast<Int&>(_timeout));
     s->read(const_cast<bool&>(_compress));
+    if(s->getReadEncoding() > Ice::Encoding_1_0)
+    {
+        const_cast<Ice::ProtocolVersion&>(_protocol).__read(s);
+        const_cast<Ice::EncodingVersion&>(_encoding).__read(s);
+    }
+    else
+    {
+        const_cast<ProtocolVersion&>(_protocol) = Ice::Protocol_1_0;
+        const_cast<EncodingVersion&>(_encoding) = Ice::Encoding_1_0;
+    }
     s->endReadEncaps();
 }
 
@@ -252,6 +261,11 @@ IceInternal::StreamEndpointI::streamWrite(BasicStream* s) const
     s->write(_port);
     s->write(_timeout);
     s->write(_compress);
+    if(s->getWriteEncoding() > Ice::Encoding_1_0)
+    {
+        _protocol.__write(s);
+        _encoding.__write(s);
+    }
     s->endWriteEncaps();
 }
 
@@ -268,6 +282,16 @@ IceInternal::StreamEndpointI::toString() const
     ostringstream s;
     s << "" + typeToString(_type) + "";
 
+    if(_protocol != Ice::Protocol_1_0)
+    {
+        s << " -v " << _protocol;
+    }
+
+    if(_encoding != Ice::Encoding_1_0)
+    {
+        s << " -e " << _encoding;
+    }
+    
     if(!_host.empty())
     {
         s << " -h ";
@@ -301,9 +325,9 @@ IceInternal::StreamEndpointI::getInfo() const
     switch(_type)
     {
     case TCPEndpointType:
-        return new InfoI<Ice::TCPEndpointInfo>(_type, _timeout, _compress, _host, _port);
+        return new InfoI<Ice::TCPEndpointInfo>(_protocol, _encoding, _type, _timeout, _compress, _host, _port);
     case IceSSL::EndpointType:
-        return new InfoI<IceSSL::EndpointInfo>(_type, _timeout, _compress, _host, _port);
+        return new InfoI<IceSSL::EndpointInfo>(_protocol, _encoding, _type, _timeout, _compress, _host, _port);
     default:
         assert(false);
         return 0;
@@ -578,7 +602,7 @@ IceInternal::StreamEndpointI::connectors(const vector<Address>& addresses) const
     vector<ConnectorPtr> connectors;
     for(unsigned int i = 0; i < addresses.size(); ++i)
     {
-        connectors.push_back(new StreamConnector(_instance, _type, addresses[i], _timeout, _connectionId));
+        connectors.push_back(new StreamConnector(_instance, _type, addresses[i], _timeout, _protocol, _encoding, _connectionId));
     }
     return connectors;
 }
diff --git a/cpp/src/IceDB/FreezeTypes.h b/cpp/src/IceDB/FreezeTypes.h
index e09763cd232..ec351dc48c8 100644
--- a/cpp/src/IceDB/FreezeTypes.h
+++ b/cpp/src/IceDB/FreezeTypes.h
@@ -108,17 +108,13 @@ public:
         try
         {
             std::map<Key, Value> m;
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-            for(Dict::const_iterator p = _dict.begin(); p != _dict.end(); ++p)
-#else
             for(typename Dict::const_iterator p = _dict.begin(); p != _dict.end(); ++p)
-#endif
             {
 #ifdef __SUNPRO_CC             
                 std::map<Key, Value>::value_type v(p->first, p->second);
                 m.insert(v);
 #else
-		m.insert(*p);
+                m.insert(*p);
 #endif
             }
             return m;
@@ -135,11 +131,7 @@ public:
     {
         try
         {
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-            _dict.put(Dict::value_type(key, data));
-#else
             _dict.put(typename Dict::value_type(key, data));
-#endif
         }
         catch(const Freeze::DatabaseException& ex)
         {
@@ -153,11 +145,7 @@ public:
     {
         try
         {
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-	    Dict::const_iterator p = _dict.find(key);
-#else
             typename Dict::const_iterator p = _dict.find(key);
-#endif
             if(p == _dict.end())
             {
                 throw NotFoundException(__FILE__, __LINE__);
diff --git a/cpp/src/IceDB/Makefile.mak b/cpp/src/IceDB/Makefile.mak
index 8c5b84957bd..635dac261a3 100644
--- a/cpp/src/IceDB/Makefile.mak
+++ b/cpp/src/IceDB/Makefile.mak
@@ -28,11 +28,7 @@ LINKWITH        = $(BASELIBS)
 PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)

 !endif

 

-!if "$(BCPLUSPLUS)" == "yes"

-RES_FILE        = ,, IceDB.res

-!else

 RES_FILE        = IceDB.res

-!endif

 

 $(LIBNAME): $(DLLNAME)

 

@@ -50,13 +46,7 @@ install:: all
 	copy $(LIBNAME) "$(install_libdir)"

 	copy $(DLLNAME) "$(install_bindir)"

 

-

-!if "$(BCPLUSPLUS)" == "yes" && "$(OPTIMIZE)" != "yes"

-

-install:: all

-	copy $(DLLNAME:.dll=.tds) "$(install_bindir)"

-

-!elseif "$(GENERATE_PDB)" == "yes"

+!if "$(GENERATE_PDB)" == "yes"

 

 install:: all

 	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"

diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp
index 0c5a82cf24a..628978b6488 100644
--- a/cpp/src/IceGrid/Activator.cpp
+++ b/cpp/src/IceGrid/Activator.cpp
@@ -481,11 +481,7 @@ Activator::activate(const string& name,
     //
     // Make a copy of the command line.
     //
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
     wchar_t* cmdbuf = _wcsdup(IceUtil::stringToWstring(cmd).c_str());
-#else
-    wchar_t* cmdbuf = wcsdup(IceUtil::stringToWstring(cmd).c_str());
-#endif
 
     //
     // Create the environment block for the child process. We start with the environment
diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp
index 1b38c97dfbe..052957900ac 100644
--- a/cpp/src/IceGrid/Client.cpp
+++ b/cpp/src/IceGrid/Client.cpp
@@ -34,7 +34,7 @@
 #endif
 
 using namespace std;
-//using namespace Ice; // COMPILERFIX: VC6 reports compilation error because of ambiguous Locator symbol.
+using namespace Ice;
 using namespace IceGrid;
 
 class Client;
@@ -92,7 +92,7 @@ public:
             {
                 _session->keepAlive();
             }
-            catch(const Ice::Exception&)
+            catch(const Exception&)
             {
                 break;
             }
@@ -115,40 +115,40 @@ private:
 };
 typedef IceUtil::Handle<SessionKeepAliveThread> SessionKeepAliveThreadPtr;
 
-class ReuseConnectionRouter : public Ice::Router
+class ReuseConnectionRouter : public Router
 {
 public:
     
-    ReuseConnectionRouter(const Ice::ObjectPrx& proxy) : _clientProxy(proxy)
+    ReuseConnectionRouter(const ObjectPrx& proxy) : _clientProxy(proxy)
     {
     }
 
-    virtual Ice::ObjectPrx 
-    getClientProxy(const Ice::Current&) const
+    virtual ObjectPrx 
+    getClientProxy(const Current&) const
     {
         return _clientProxy;
     }
 
-    virtual Ice::ObjectPrx 
-    getServerProxy(const Ice::Current&) const
+    virtual ObjectPrx 
+    getServerProxy(const Current&) const
     {
         return 0;
     }
 
     virtual void
-    addProxy(const Ice::ObjectPrx&, const Ice::Current&)
+    addProxy(const ObjectPrx&, const Current&)
     {
     }
 
-    virtual Ice::ObjectProxySeq 
-    addProxies(const Ice::ObjectProxySeq&, const Ice::Current&)
+    virtual ObjectProxySeq 
+    addProxies(const ObjectProxySeq&, const Current&)
     {
-        return Ice::ObjectProxySeq();
+        return ObjectProxySeq();
     }
     
 private:
 
-    const Ice::ObjectPrx _clientProxy;
+    const ObjectPrx _clientProxy;
 };
 
 class Client : public IceUtil::Monitor<IceUtil::Mutex>
@@ -156,11 +156,11 @@ class Client : public IceUtil::Monitor<IceUtil::Mutex>
 public:
 
     void usage();
-    int main(Ice::StringSeq& args);
-    int run(Ice::StringSeq& args);
+    int main(StringSeq& args);
+    int run(StringSeq& args);
     void interrupted();
 
-    Ice::CommunicatorPtr communicator() const { return _communicator; }
+    CommunicatorPtr communicator() const { return _communicator; }
     const string& appName() const { return _appName; }
 
     string getPassword(const string&);
@@ -168,7 +168,7 @@ public:
 private:
 
     IceUtil::CtrlCHandler _ctrlCHandler;
-    Ice::CommunicatorPtr _communicator;
+    CommunicatorPtr _communicator;
     string _appName;
     ParserPtr _parser;
 };
@@ -196,7 +196,7 @@ main(int argc, char* argv[])
 #endif
 {
     Client app;
-    Ice::StringSeq args = Ice::argsToStringSeq(argc, argv);
+    StringSeq args = argsToStringSeq(argc, argv);
     return app.main(args);
 }
 
@@ -220,22 +220,22 @@ Client::usage()
 
 
 int
-Client::main(Ice::StringSeq& args)
+Client::main(StringSeq& args)
 {
     int status = EXIT_SUCCESS;
 
     try
     {
         _appName = args[0];
-        Ice::InitializationData id;
-        id.properties = Ice::createProperties(args);
+        InitializationData id;
+        id.properties = createProperties(args);
         //
         // We don't want to load DB plug-ins with icegridadmin, as this will
         // cause FileLock issues when run with the same configuration file
         // used by the service.
         //
         id.properties->setProperty("Ice.Plugin.DB", "");
-        _communicator = Ice::initialize(id);
+        _communicator = initialize(id);
 
         {
             IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(_staticMutex);
@@ -247,7 +247,7 @@ Client::main(Ice::StringSeq& args)
         {
             status = run(args);
         }
-        catch(const Ice::CommunicatorDestroyedException&)
+        catch(const CommunicatorDestroyedException&)
         {
             // Expected if the client is interrupted during the initialization.
         }
@@ -284,10 +284,10 @@ Client::main(Ice::StringSeq& args)
         {
             _communicator->destroy();
         }
-        catch(const Ice::CommunicatorDestroyedException&)
+        catch(const CommunicatorDestroyedException&)
         {
         }
-        catch(const Ice::Exception& ex)
+        catch(const Exception& ex)
         {
             cerr << ex << endl;
             status = EXIT_FAILURE;
@@ -322,14 +322,14 @@ Client::interrupted()
         {
             _communicator->destroy();
         }
-        catch(const Ice::Exception&)
+        catch(const Exception&)
         {
         }
     }
 }
 
 int
-Client::run(Ice::StringSeq& originalArgs)
+Client::run(StringSeq& originalArgs)
 {
     string commands;
     bool debug;
@@ -376,10 +376,10 @@ Client::run(Ice::StringSeq& originalArgs)
 
     if(opts.isSet("server"))
     {
-        Ice::ObjectAdapterPtr adapter = 
+        ObjectAdapterPtr adapter = 
             communicator()->createObjectAdapterWithEndpoints("FileParser", "tcp -h localhost");
         adapter->activate();
-        Ice::ObjectPrx proxy = adapter->add(new FileParserI, communicator()->stringToIdentity("FileParser"));
+        ObjectPrx proxy = adapter->add(new FileParserI, communicator()->stringToIdentity("FileParser"));
         cout << proxy << endl;
 
         communicator()->waitForShutdown();
@@ -413,7 +413,7 @@ Client::run(Ice::StringSeq& originalArgs)
         password = opts.optArg("password");
     }
 
-    Ice::PropertiesPtr properties = communicator()->getProperties();
+    PropertiesPtr properties = communicator()->getProperties();
     string replica = properties->getProperty("IceGridAdmin.Replica");
     if(!opts.optArg("replica").empty())
     {
@@ -439,7 +439,7 @@ Client::run(Ice::StringSeq& originalArgs)
                     return EXIT_FAILURE;
                 }
             }
-            catch(const Ice::LocalException& ex)
+            catch(const LocalException& ex)
             {
                 cerr << _appName << ": could not contact the default router:" << endl << ex << endl;
                 return EXIT_FAILURE;                
@@ -501,7 +501,7 @@ Client::run(Ice::StringSeq& originalArgs)
             //
             // Create the identity of the registry to connect to.
             //
-            Ice::Identity registryId;
+            Identity registryId;
             registryId.category = communicator()->getDefaultLocator()->ice_getIdentity().category;
             registryId.name = "Registry";
             if(!replica.empty() && replica != "Master")
@@ -526,7 +526,7 @@ Client::run(Ice::StringSeq& originalArgs)
                 }
                 localRegistry = locator->getLocalRegistry();
             }
-            catch(const Ice::LocalException& ex)
+            catch(const LocalException& ex)
             {
                 cerr << _appName << ": could not contact the default locator:" << endl << ex << endl;
                 return EXIT_FAILURE;                    
@@ -552,12 +552,12 @@ Client::run(Ice::StringSeq& originalArgs)
                         cerr << _appName << ": could not contact an IceGrid registry" << endl;
                     }
                 }
-                catch(const Ice::NotRegisteredException&)
+                catch(const NotRegisteredException&)
                 {
                     cerr << _appName << ": no active registry replica named `" << replica << "'" << endl;
                     return EXIT_FAILURE;            
                 }
-                catch(const Ice::LocalException& ex)
+                catch(const LocalException& ex)
                 {
                     if(!replica.empty())
                     {
@@ -591,10 +591,10 @@ Client::run(Ice::StringSeq& originalArgs)
             if(registry->ice_getIdentity() == localRegistry->ice_getIdentity())
             {
                 properties->setProperty("CollocInternal.AdapterId", IceUtil::generateUUID());
-                Ice::ObjectAdapterPtr colloc = communicator()->createObjectAdapter("CollocInternal");
+                ObjectAdapterPtr colloc = communicator()->createObjectAdapter("CollocInternal");
                 colloc->setLocator(0);
-                Ice::ObjectPrx router = colloc->addWithUUID(new ReuseConnectionRouter(locator));
-                communicator()->setDefaultRouter(Ice::RouterPrx::uncheckedCast(router));
+                ObjectPrx router = colloc->addWithUUID(new ReuseConnectionRouter(locator));
+                communicator()->setDefaultRouter(RouterPrx::uncheckedCast(router));
                 registry = registry->ice_router(communicator()->getDefaultRouter());
             }
 
@@ -654,8 +654,8 @@ Client::run(Ice::StringSeq& originalArgs)
 
         AdminPrx admin = session->getAdmin();
 
-        Ice::SliceChecksumDict serverChecksums = admin->getSliceChecksums();
-        Ice::SliceChecksumDict localChecksums = Ice::sliceChecksums();
+        SliceChecksumDict serverChecksums = admin->getSliceChecksums();
+        SliceChecksumDict localChecksums = sliceChecksums();
 
         //
         // The following slice types are only used by the admin CLI.
@@ -663,9 +663,9 @@ Client::run(Ice::StringSeq& originalArgs)
         localChecksums.erase("::IceGrid::FileParser");
         localChecksums.erase("::IceGrid::ParseException");
                          
-        for(Ice::SliceChecksumDict::const_iterator q = localChecksums.begin(); q != localChecksums.end(); ++q)
+        for(SliceChecksumDict::const_iterator q = localChecksums.begin(); q != localChecksums.end(); ++q)
         {
-            Ice::SliceChecksumDict::const_iterator r = serverChecksums.find(q->first);
+            SliceChecksumDict::const_iterator r = serverChecksums.find(q->first);
             if(r == serverChecksums.end())
             {
                 cerr << appName() << ": server is using unknown Slice type `" << q->first << "'" << endl;
@@ -734,7 +734,7 @@ Client::run(Ice::StringSeq& originalArgs)
                 session->destroy();
             }
         }
-        catch(const Ice::Exception&)
+        catch(const Exception&)
         {
         }
         throw;
@@ -759,7 +759,7 @@ Client::run(Ice::StringSeq& originalArgs)
                 session->destroy();
             }
         }
-        catch(const Ice::Exception&)
+        catch(const Exception&)
         {
             // Ignore. If the registry has been shutdown this will cause
             // an exception.
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp
index bcd8beb33cd..67467f280f9 100644
--- a/cpp/src/IceGrid/DescriptorHelper.cpp
+++ b/cpp/src/IceGrid/DescriptorHelper.cpp
@@ -117,19 +117,11 @@ struct ReplicaGroupEq : std::binary_function<ReplicaGroupDescriptor&, ReplicaGro
 template <typename GetKeyFunc, typename Seq> Seq
 getSeqUpdatedElts(const Seq& lseq, const Seq& rseq, GetKeyFunc func)
 {
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-   return getSeqUpdatedEltsWithEq(lseq, rseq, func, equal_to<Seq::value_type>());
-#else
    return getSeqUpdatedEltsWithEq(lseq, rseq, func, equal_to<typename Seq::value_type>());
-#endif
 }
 
 template <typename GetKeyFunc, typename EqFunc, typename Seq> Seq
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
 getSeqUpdatedEltsWithEq(const Seq& lseq, const Seq& rseq, GetKeyFunc func, EqFunc eq)
-#else
-getSeqUpdatedEltsWithEq(const Seq& lseq, const Seq& rseq, GetKeyFunc func, EqFunc eq)
-#endif
 {
     Seq result;
     for(typename Seq::const_iterator p = rseq.begin(); p != rseq.end(); ++p)
@@ -216,11 +208,7 @@ getDictUpdatedEltsWithEq(const Dict& ldict, const Dict& rdict, EqFunc eq)
 template<typename Dict> Dict
 getDictUpdatedElts(const Dict& ldict, const Dict& rdict)
 {
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-    return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<Dict::mapped_type>());
-#else
     return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<typename Dict::mapped_type>());
-#endif
 }
 
 template <typename Dict> Ice::StringSeq
diff --git a/cpp/src/IceGrid/FileCache.cpp b/cpp/src/IceGrid/FileCache.cpp
index 0ac4a071333..b34d7978710 100644
--- a/cpp/src/IceGrid/FileCache.cpp
+++ b/cpp/src/IceGrid/FileCache.cpp
@@ -164,11 +164,7 @@ FileCache::read(const string& file, Ice::Long offset, int size, Ice::Long& newOf
     // 
     newOffset = offset;
     lines = Ice::StringSeq();
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-    is.seekg(static_cast<int>(offset));
-#else
     is.seekg(static_cast<streamoff>(offset), ios::beg);
-#endif
     int totalSize = 0;
     string line;
 
diff --git a/cpp/src/IceGrid/Grammar.cpp b/cpp/src/IceGrid/Grammar.cpp
index e97009b1f36..59fb3c06f7a 100644
--- a/cpp/src/IceGrid/Grammar.cpp
+++ b/cpp/src/IceGrid/Grammar.cpp
@@ -1,10 +1,9 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.4.3.  */
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2009, 2010 Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -46,7 +45,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.4.3"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -68,7 +67,7 @@
 /* Copy the first part of user declarations.  */
 
 /* Line 189 of yacc.c  */
-#line 1 "../IceGrid/Grammar.y"
+#line 1 "Grammar.y"
 
 
 // **********************************************************************
@@ -104,7 +103,7 @@ yyerror(const char* s)
 
 
 /* Line 189 of yacc.c  */
-#line 108 "Grammar.tab.c"
+#line 107 "Grammar.tab.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -188,7 +187,7 @@ typedef int YYSTYPE;
 
 
 /* Line 264 of yacc.c  */
-#line 192 "Grammar.tab.c"
+#line 191 "Grammar.tab.c"
 
 #ifdef short
 # undef short
@@ -238,7 +237,7 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -1355,9 +1354,18 @@ static const yytype_uint8 yystos[] =
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
+   Once GCC version 2 has supplanted version 1, this can go.  However,
+   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
+   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
+   discussed.  */
 
 #define YYFAIL		goto yyerrlab
+#if defined YYFAIL
+  /* This is here to suppress warnings from the GCC cpp's
+     -Wunused-macros.  Normally we don't worry about that warning, but
+     some users do, and we want to make it easy for users to remove
+     YYFAIL uses, which will produce warnings from Bison 2.5.  */
+#endif
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
@@ -1414,7 +1422,7 @@ while (YYID (0))
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
 #  define YY_LOCATION_PRINT(File, Loc)			\
      fprintf (File, "%d.%d-%d.%d",			\
 	      (Loc).first_line, (Loc).first_column,	\
@@ -2152,40 +2160,40 @@ yyreduce:
     {
         case 2:
 
-/* Line 1455 of yacc.c  */
-#line 89 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 89 "Grammar.y"
     {
 ;}
     break;
 
   case 3:
 
-/* Line 1455 of yacc.c  */
-#line 92 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 92 "Grammar.y"
     {
 ;}
     break;
 
   case 4:
 
-/* Line 1455 of yacc.c  */
-#line 100 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 100 "Grammar.y"
     {
 ;}
     break;
 
   case 5:
 
-/* Line 1455 of yacc.c  */
-#line 103 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 103 "Grammar.y"
     {
 ;}
     break;
 
   case 6:
 
-/* Line 1455 of yacc.c  */
-#line 109 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 109 "Grammar.y"
     {
     parser->checkInterrupted();
 ;}
@@ -2193,8 +2201,8 @@ yyreduce:
 
   case 7:
 
-/* Line 1455 of yacc.c  */
-#line 118 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 118 "Grammar.y"
     {
     parser->usage();
 ;}
@@ -2202,8 +2210,8 @@ yyreduce:
 
   case 8:
 
-/* Line 1455 of yacc.c  */
-#line 122 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 122 "Grammar.y"
     {
     return 0;
 ;}
@@ -2211,8 +2219,8 @@ yyreduce:
 
   case 9:
 
-/* Line 1455 of yacc.c  */
-#line 126 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 126 "Grammar.y"
     {
     parser->addApplication((yyvsp[(3) - (4)]));
 ;}
@@ -2220,8 +2228,8 @@ yyreduce:
 
   case 10:
 
-/* Line 1455 of yacc.c  */
-#line 130 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 130 "Grammar.y"
     {
     parser->usage("application", "add");
 ;}
@@ -2229,8 +2237,8 @@ yyreduce:
 
   case 11:
 
-/* Line 1455 of yacc.c  */
-#line 134 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 134 "Grammar.y"
     {
     parser->removeApplication((yyvsp[(3) - (4)]));
 ;}
@@ -2238,8 +2246,8 @@ yyreduce:
 
   case 12:
 
-/* Line 1455 of yacc.c  */
-#line 138 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 138 "Grammar.y"
     {
     parser->usage("application", "remove");
 ;}
@@ -2247,8 +2255,8 @@ yyreduce:
 
   case 13:
 
-/* Line 1455 of yacc.c  */
-#line 142 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 142 "Grammar.y"
     {
     parser->diffApplication((yyvsp[(3) - (4)]));
 ;}
@@ -2256,8 +2264,8 @@ yyreduce:
 
   case 14:
 
-/* Line 1455 of yacc.c  */
-#line 146 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 146 "Grammar.y"
     {
     parser->usage("application", "diff");
 ;}
@@ -2265,8 +2273,8 @@ yyreduce:
 
   case 15:
 
-/* Line 1455 of yacc.c  */
-#line 150 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 150 "Grammar.y"
     {
     parser->updateApplication((yyvsp[(3) - (4)]));
 ;}
@@ -2274,8 +2282,8 @@ yyreduce:
 
   case 16:
 
-/* Line 1455 of yacc.c  */
-#line 154 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 154 "Grammar.y"
     {
     parser->usage("application", "update");
 ;}
@@ -2283,8 +2291,8 @@ yyreduce:
 
   case 17:
 
-/* Line 1455 of yacc.c  */
-#line 158 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 158 "Grammar.y"
     {
     parser->describeApplication((yyvsp[(3) - (4)]));
 ;}
@@ -2292,8 +2300,8 @@ yyreduce:
 
   case 18:
 
-/* Line 1455 of yacc.c  */
-#line 162 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 162 "Grammar.y"
     {
     parser->usage("application", "describe");
 ;}
@@ -2301,8 +2309,8 @@ yyreduce:
 
   case 19:
 
-/* Line 1455 of yacc.c  */
-#line 166 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 166 "Grammar.y"
     {
     parser->patchApplication((yyvsp[(3) - (4)]));
 ;}
@@ -2310,8 +2318,8 @@ yyreduce:
 
   case 20:
 
-/* Line 1455 of yacc.c  */
-#line 170 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 170 "Grammar.y"
     {
     parser->usage("application", "patch");
 ;}
@@ -2319,8 +2327,8 @@ yyreduce:
 
   case 21:
 
-/* Line 1455 of yacc.c  */
-#line 174 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 174 "Grammar.y"
     {
     parser->listAllApplications((yyvsp[(3) - (4)]));
 ;}
@@ -2328,8 +2336,8 @@ yyreduce:
 
   case 22:
 
-/* Line 1455 of yacc.c  */
-#line 178 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 178 "Grammar.y"
     {
     parser->usage("application", "list");
 ;}
@@ -2337,8 +2345,8 @@ yyreduce:
 
   case 23:
 
-/* Line 1455 of yacc.c  */
-#line 182 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 182 "Grammar.y"
     {
     parser->describeServerTemplate((yyvsp[(4) - (5)]));
 ;}
@@ -2346,8 +2354,8 @@ yyreduce:
 
   case 24:
 
-/* Line 1455 of yacc.c  */
-#line 186 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 186 "Grammar.y"
     {
     parser->usage("server template", "describe");
 ;}
@@ -2355,8 +2363,8 @@ yyreduce:
 
   case 25:
 
-/* Line 1455 of yacc.c  */
-#line 190 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 190 "Grammar.y"
     {
     parser->instantiateServerTemplate((yyvsp[(4) - (5)]));
 ;}
@@ -2364,8 +2372,8 @@ yyreduce:
 
   case 26:
 
-/* Line 1455 of yacc.c  */
-#line 194 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 194 "Grammar.y"
     {
     parser->usage("server template", "instantiate");
 ;}
@@ -2373,8 +2381,8 @@ yyreduce:
 
   case 27:
 
-/* Line 1455 of yacc.c  */
-#line 198 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 198 "Grammar.y"
     {
     parser->usage("server template");
 ;}
@@ -2382,8 +2390,8 @@ yyreduce:
 
   case 28:
 
-/* Line 1455 of yacc.c  */
-#line 202 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 202 "Grammar.y"
     {
     parser->describeServiceTemplate((yyvsp[(4) - (5)]));
 ;}
@@ -2391,8 +2399,8 @@ yyreduce:
 
   case 29:
 
-/* Line 1455 of yacc.c  */
-#line 206 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 206 "Grammar.y"
     {
     parser->usage("service template", "describe");
 ;}
@@ -2400,8 +2408,8 @@ yyreduce:
 
   case 30:
 
-/* Line 1455 of yacc.c  */
-#line 210 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 210 "Grammar.y"
     {
     parser->usage("service template");
 ;}
@@ -2409,8 +2417,8 @@ yyreduce:
 
   case 31:
 
-/* Line 1455 of yacc.c  */
-#line 214 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 214 "Grammar.y"
     {
     parser->describeNode((yyvsp[(3) - (4)]));
 ;}
@@ -2418,8 +2426,8 @@ yyreduce:
 
   case 32:
 
-/* Line 1455 of yacc.c  */
-#line 218 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 218 "Grammar.y"
     {
     parser->usage("node", "describe");
 ;}
@@ -2427,8 +2435,8 @@ yyreduce:
 
   case 33:
 
-/* Line 1455 of yacc.c  */
-#line 222 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 222 "Grammar.y"
     {
     parser->pingNode((yyvsp[(3) - (4)]));
 ;}
@@ -2436,8 +2444,8 @@ yyreduce:
 
   case 34:
 
-/* Line 1455 of yacc.c  */
-#line 226 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 226 "Grammar.y"
     {
     parser->usage("node", "ping");
 ;}
@@ -2445,8 +2453,8 @@ yyreduce:
 
   case 35:
 
-/* Line 1455 of yacc.c  */
-#line 230 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 230 "Grammar.y"
     {
     parser->printLoadNode((yyvsp[(3) - (4)]));
 ;}
@@ -2454,8 +2462,8 @@ yyreduce:
 
   case 36:
 
-/* Line 1455 of yacc.c  */
-#line 234 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 234 "Grammar.y"
     {
     parser->usage("node", "load");
 ;}
@@ -2463,8 +2471,8 @@ yyreduce:
 
   case 37:
 
-/* Line 1455 of yacc.c  */
-#line 238 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 238 "Grammar.y"
     {
     parser->printNodeProcessors((yyvsp[(3) - (4)]));
 ;}
@@ -2472,8 +2480,8 @@ yyreduce:
 
   case 38:
 
-/* Line 1455 of yacc.c  */
-#line 242 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 242 "Grammar.y"
     {
     parser->usage("node", "processors");
 ;}
@@ -2481,8 +2489,8 @@ yyreduce:
 
   case 39:
 
-/* Line 1455 of yacc.c  */
-#line 246 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 246 "Grammar.y"
     {
     parser->shutdownNode((yyvsp[(3) - (4)]));
 ;}
@@ -2490,8 +2498,8 @@ yyreduce:
 
   case 40:
 
-/* Line 1455 of yacc.c  */
-#line 250 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 250 "Grammar.y"
     {
     parser->usage("node", "shutdown");
 ;}
@@ -2499,8 +2507,8 @@ yyreduce:
 
   case 41:
 
-/* Line 1455 of yacc.c  */
-#line 254 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 254 "Grammar.y"
     {
     parser->listAllNodes((yyvsp[(3) - (4)]));
 ;}
@@ -2508,8 +2516,8 @@ yyreduce:
 
   case 42:
 
-/* Line 1455 of yacc.c  */
-#line 258 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 258 "Grammar.y"
     {
     parser->usage("node", "list");
 ;}
@@ -2517,8 +2525,8 @@ yyreduce:
 
   case 43:
 
-/* Line 1455 of yacc.c  */
-#line 262 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 262 "Grammar.y"
     {
     parser->showFile("node", (yyvsp[(3) - (4)]));
 ;}
@@ -2526,8 +2534,8 @@ yyreduce:
 
   case 44:
 
-/* Line 1455 of yacc.c  */
-#line 266 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 266 "Grammar.y"
     {
     parser->usage("node", "show");
 ;}
@@ -2535,8 +2543,8 @@ yyreduce:
 
   case 45:
 
-/* Line 1455 of yacc.c  */
-#line 270 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 270 "Grammar.y"
     {
     parser->describeRegistry((yyvsp[(3) - (4)]));
 ;}
@@ -2544,8 +2552,8 @@ yyreduce:
 
   case 46:
 
-/* Line 1455 of yacc.c  */
-#line 274 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 274 "Grammar.y"
     {
     parser->usage("registry", "describe");
 ;}
@@ -2553,8 +2561,8 @@ yyreduce:
 
   case 47:
 
-/* Line 1455 of yacc.c  */
-#line 278 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 278 "Grammar.y"
     {
     parser->pingRegistry((yyvsp[(3) - (4)]));
 ;}
@@ -2562,8 +2570,8 @@ yyreduce:
 
   case 48:
 
-/* Line 1455 of yacc.c  */
-#line 282 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 282 "Grammar.y"
     {
     parser->usage("registry", "ping");
 ;}
@@ -2571,8 +2579,8 @@ yyreduce:
 
   case 49:
 
-/* Line 1455 of yacc.c  */
-#line 286 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 286 "Grammar.y"
     {
     parser->shutdownRegistry((yyvsp[(3) - (4)]));
 ;}
@@ -2580,8 +2588,8 @@ yyreduce:
 
   case 50:
 
-/* Line 1455 of yacc.c  */
-#line 290 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 290 "Grammar.y"
     {
     parser->usage("registry", "shutdown");
 ;}
@@ -2589,8 +2597,8 @@ yyreduce:
 
   case 51:
 
-/* Line 1455 of yacc.c  */
-#line 294 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 294 "Grammar.y"
     {
     parser->listAllRegistries((yyvsp[(3) - (4)]));
 ;}
@@ -2598,8 +2606,8 @@ yyreduce:
 
   case 52:
 
-/* Line 1455 of yacc.c  */
-#line 298 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 298 "Grammar.y"
     {
     parser->usage("registry", "list");
 ;}
@@ -2607,8 +2615,8 @@ yyreduce:
 
   case 53:
 
-/* Line 1455 of yacc.c  */
-#line 302 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 302 "Grammar.y"
     {
     parser->showFile("registry", (yyvsp[(3) - (4)]));
 ;}
@@ -2616,8 +2624,8 @@ yyreduce:
 
   case 54:
 
-/* Line 1455 of yacc.c  */
-#line 306 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 306 "Grammar.y"
     {
     parser->usage("registry", "show");
 ;}
@@ -2625,8 +2633,8 @@ yyreduce:
 
   case 55:
 
-/* Line 1455 of yacc.c  */
-#line 310 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 310 "Grammar.y"
     {
     parser->removeServer((yyvsp[(3) - (4)]));
 ;}
@@ -2634,8 +2642,8 @@ yyreduce:
 
   case 56:
 
-/* Line 1455 of yacc.c  */
-#line 314 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 314 "Grammar.y"
     {
     parser->usage("server", "remove");
 ;}
@@ -2643,8 +2651,8 @@ yyreduce:
 
   case 57:
 
-/* Line 1455 of yacc.c  */
-#line 318 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 318 "Grammar.y"
     {
     parser->describeServer((yyvsp[(3) - (4)]));
 ;}
@@ -2652,8 +2660,8 @@ yyreduce:
 
   case 58:
 
-/* Line 1455 of yacc.c  */
-#line 322 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 322 "Grammar.y"
     {
     parser->usage("server", "describe");
 ;}
@@ -2661,8 +2669,8 @@ yyreduce:
 
   case 59:
 
-/* Line 1455 of yacc.c  */
-#line 326 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 326 "Grammar.y"
     {
     parser->startServer((yyvsp[(3) - (4)]));
 ;}
@@ -2670,8 +2678,8 @@ yyreduce:
 
   case 60:
 
-/* Line 1455 of yacc.c  */
-#line 330 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 330 "Grammar.y"
     {
     parser->usage("server", "start");
 ;}
@@ -2679,8 +2687,8 @@ yyreduce:
 
   case 61:
 
-/* Line 1455 of yacc.c  */
-#line 334 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 334 "Grammar.y"
     {
     parser->stopServer((yyvsp[(3) - (4)]));
 ;}
@@ -2688,8 +2696,8 @@ yyreduce:
 
   case 62:
 
-/* Line 1455 of yacc.c  */
-#line 338 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 338 "Grammar.y"
     {
     parser->usage("server", "stop");
 ;}
@@ -2697,8 +2705,8 @@ yyreduce:
 
   case 63:
 
-/* Line 1455 of yacc.c  */
-#line 342 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 342 "Grammar.y"
     {
     parser->patchServer((yyvsp[(3) - (4)]));
 ;}
@@ -2706,8 +2714,8 @@ yyreduce:
 
   case 64:
 
-/* Line 1455 of yacc.c  */
-#line 346 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 346 "Grammar.y"
     {
     parser->usage("server", "patch");
 ;}
@@ -2715,8 +2723,8 @@ yyreduce:
 
   case 65:
 
-/* Line 1455 of yacc.c  */
-#line 350 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 350 "Grammar.y"
     {
     parser->signalServer((yyvsp[(3) - (4)]));
 ;}
@@ -2724,8 +2732,8 @@ yyreduce:
 
   case 66:
 
-/* Line 1455 of yacc.c  */
-#line 354 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 354 "Grammar.y"
     {
     parser->usage("server", "signal");
 ;}
@@ -2733,8 +2741,8 @@ yyreduce:
 
   case 67:
 
-/* Line 1455 of yacc.c  */
-#line 358 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 358 "Grammar.y"
     {
     parser->writeMessage((yyvsp[(3) - (4)]), 1);
 ;}
@@ -2742,8 +2750,8 @@ yyreduce:
 
   case 68:
 
-/* Line 1455 of yacc.c  */
-#line 362 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 362 "Grammar.y"
     {
     parser->usage("server", "stdout");
 ;}
@@ -2751,8 +2759,8 @@ yyreduce:
 
   case 69:
 
-/* Line 1455 of yacc.c  */
-#line 366 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 366 "Grammar.y"
     {
     parser->writeMessage((yyvsp[(3) - (4)]), 2);
 ;}
@@ -2760,8 +2768,8 @@ yyreduce:
 
   case 70:
 
-/* Line 1455 of yacc.c  */
-#line 370 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 370 "Grammar.y"
     {
     parser->usage("server", "stderr");
 ;}
@@ -2769,8 +2777,8 @@ yyreduce:
 
   case 71:
 
-/* Line 1455 of yacc.c  */
-#line 374 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 374 "Grammar.y"
     {
     parser->stateServer((yyvsp[(3) - (4)]));
 ;}
@@ -2778,8 +2786,8 @@ yyreduce:
 
   case 72:
 
-/* Line 1455 of yacc.c  */
-#line 378 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 378 "Grammar.y"
     {
     parser->usage("server", "start");
 ;}
@@ -2787,8 +2795,8 @@ yyreduce:
 
   case 73:
 
-/* Line 1455 of yacc.c  */
-#line 382 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 382 "Grammar.y"
     {
     parser->pidServer((yyvsp[(3) - (4)]));
 ;}
@@ -2796,8 +2804,8 @@ yyreduce:
 
   case 74:
 
-/* Line 1455 of yacc.c  */
-#line 386 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 386 "Grammar.y"
     {
     parser->usage("server", "pid");
 ;}
@@ -2805,8 +2813,8 @@ yyreduce:
 
   case 75:
 
-/* Line 1455 of yacc.c  */
-#line 390 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 390 "Grammar.y"
     {
     parser->propertiesServer((yyvsp[(3) - (4)]), false);
 ;}
@@ -2814,8 +2822,8 @@ yyreduce:
 
   case 76:
 
-/* Line 1455 of yacc.c  */
-#line 394 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 394 "Grammar.y"
     {
     parser->usage("server", "properties");
 ;}
@@ -2823,8 +2831,8 @@ yyreduce:
 
   case 77:
 
-/* Line 1455 of yacc.c  */
-#line 398 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 398 "Grammar.y"
     {
     parser->propertiesServer((yyvsp[(3) - (4)]), true);
 ;}
@@ -2832,8 +2840,8 @@ yyreduce:
 
   case 78:
 
-/* Line 1455 of yacc.c  */
-#line 402 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 402 "Grammar.y"
     {
     parser->usage("server", "property");
 ;}
@@ -2841,8 +2849,8 @@ yyreduce:
 
   case 79:
 
-/* Line 1455 of yacc.c  */
-#line 406 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 406 "Grammar.y"
     {
     parser->enableServer((yyvsp[(3) - (4)]), true);
 ;}
@@ -2850,8 +2858,8 @@ yyreduce:
 
   case 80:
 
-/* Line 1455 of yacc.c  */
-#line 410 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 410 "Grammar.y"
     {
     parser->usage("server", "enable");
 ;}
@@ -2859,8 +2867,8 @@ yyreduce:
 
   case 81:
 
-/* Line 1455 of yacc.c  */
-#line 414 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 414 "Grammar.y"
     {
     parser->enableServer((yyvsp[(3) - (4)]), false);
 ;}
@@ -2868,8 +2876,8 @@ yyreduce:
 
   case 82:
 
-/* Line 1455 of yacc.c  */
-#line 418 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 418 "Grammar.y"
     {
     parser->usage("server", "disable");
 ;}
@@ -2877,8 +2885,8 @@ yyreduce:
 
   case 83:
 
-/* Line 1455 of yacc.c  */
-#line 422 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 422 "Grammar.y"
     {
     parser->listAllServers((yyvsp[(3) - (4)]));
 ;}
@@ -2886,8 +2894,8 @@ yyreduce:
 
   case 84:
 
-/* Line 1455 of yacc.c  */
-#line 426 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 426 "Grammar.y"
     {
     parser->usage("server", "list");
 ;}
@@ -2895,8 +2903,8 @@ yyreduce:
 
   case 85:
 
-/* Line 1455 of yacc.c  */
-#line 430 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 430 "Grammar.y"
     {
     parser->showFile("server", (yyvsp[(3) - (4)]));
 ;}
@@ -2904,8 +2912,8 @@ yyreduce:
 
   case 86:
 
-/* Line 1455 of yacc.c  */
-#line 434 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 434 "Grammar.y"
     {
     parser->usage("server", "show");
 ;}
@@ -2913,8 +2921,8 @@ yyreduce:
 
   case 87:
 
-/* Line 1455 of yacc.c  */
-#line 438 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 438 "Grammar.y"
     {
     parser->startService((yyvsp[(3) - (4)]));
 ;}
@@ -2922,8 +2930,8 @@ yyreduce:
 
   case 88:
 
-/* Line 1455 of yacc.c  */
-#line 442 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 442 "Grammar.y"
     {
     parser->usage("service", "start");
 ;}
@@ -2931,8 +2939,8 @@ yyreduce:
 
   case 89:
 
-/* Line 1455 of yacc.c  */
-#line 446 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 446 "Grammar.y"
     {
     parser->stopService((yyvsp[(3) - (4)]));
 ;}
@@ -2940,8 +2948,8 @@ yyreduce:
 
   case 90:
 
-/* Line 1455 of yacc.c  */
-#line 450 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 450 "Grammar.y"
     {
     parser->usage("service", "stop");
 ;}
@@ -2949,8 +2957,8 @@ yyreduce:
 
   case 91:
 
-/* Line 1455 of yacc.c  */
-#line 454 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 454 "Grammar.y"
     {
     parser->describeService((yyvsp[(3) - (4)]));
 ;}
@@ -2958,8 +2966,8 @@ yyreduce:
 
   case 92:
 
-/* Line 1455 of yacc.c  */
-#line 458 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 458 "Grammar.y"
     {
     parser->usage("service", "describe");
 ;}
@@ -2967,8 +2975,8 @@ yyreduce:
 
   case 93:
 
-/* Line 1455 of yacc.c  */
-#line 462 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 462 "Grammar.y"
     {
     parser->propertiesService((yyvsp[(3) - (4)]), false);
 ;}
@@ -2976,8 +2984,8 @@ yyreduce:
 
   case 94:
 
-/* Line 1455 of yacc.c  */
-#line 466 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 466 "Grammar.y"
     {
     parser->usage("service", "properties");
 ;}
@@ -2985,8 +2993,8 @@ yyreduce:
 
   case 95:
 
-/* Line 1455 of yacc.c  */
-#line 470 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 470 "Grammar.y"
     {
     parser->propertiesService((yyvsp[(3) - (4)]), true);
 ;}
@@ -2994,8 +3002,8 @@ yyreduce:
 
   case 96:
 
-/* Line 1455 of yacc.c  */
-#line 474 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 474 "Grammar.y"
     {
     parser->usage("service", "property");
 ;}
@@ -3003,8 +3011,8 @@ yyreduce:
 
   case 97:
 
-/* Line 1455 of yacc.c  */
-#line 478 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 478 "Grammar.y"
     {
     parser->listServices((yyvsp[(3) - (4)]));
 ;}
@@ -3012,8 +3020,8 @@ yyreduce:
 
   case 98:
 
-/* Line 1455 of yacc.c  */
-#line 482 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 482 "Grammar.y"
     {
     parser->usage("service", "list");
 ;}
@@ -3021,8 +3029,8 @@ yyreduce:
 
   case 99:
 
-/* Line 1455 of yacc.c  */
-#line 486 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 486 "Grammar.y"
     {
     parser->endpointsAdapter((yyvsp[(3) - (4)]));
 ;}
@@ -3030,8 +3038,8 @@ yyreduce:
 
   case 100:
 
-/* Line 1455 of yacc.c  */
-#line 490 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 490 "Grammar.y"
     {
     parser->usage("adapter", "endpoints");
 ;}
@@ -3039,8 +3047,8 @@ yyreduce:
 
   case 101:
 
-/* Line 1455 of yacc.c  */
-#line 494 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 494 "Grammar.y"
     {
     parser->removeAdapter((yyvsp[(3) - (4)]));
 ;}
@@ -3048,8 +3056,8 @@ yyreduce:
 
   case 102:
 
-/* Line 1455 of yacc.c  */
-#line 498 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 498 "Grammar.y"
     {
     parser->usage("adapter", "remove");
 ;}
@@ -3057,8 +3065,8 @@ yyreduce:
 
   case 103:
 
-/* Line 1455 of yacc.c  */
-#line 502 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 502 "Grammar.y"
     {
     parser->listAllAdapters((yyvsp[(3) - (4)]));
 ;}
@@ -3066,8 +3074,8 @@ yyreduce:
 
   case 104:
 
-/* Line 1455 of yacc.c  */
-#line 506 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 506 "Grammar.y"
     {
     parser->usage("adapter", "list");
 ;}
@@ -3075,8 +3083,8 @@ yyreduce:
 
   case 105:
 
-/* Line 1455 of yacc.c  */
-#line 510 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 510 "Grammar.y"
     {
     parser->addObject((yyvsp[(3) - (4)]));
 ;}
@@ -3084,8 +3092,8 @@ yyreduce:
 
   case 106:
 
-/* Line 1455 of yacc.c  */
-#line 514 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 514 "Grammar.y"
     {
     parser->usage("object", "add");
 ;}
@@ -3093,8 +3101,8 @@ yyreduce:
 
   case 107:
 
-/* Line 1455 of yacc.c  */
-#line 518 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 518 "Grammar.y"
     {
     parser->removeObject((yyvsp[(3) - (4)]));
 ;}
@@ -3102,8 +3110,8 @@ yyreduce:
 
   case 108:
 
-/* Line 1455 of yacc.c  */
-#line 522 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 522 "Grammar.y"
     {
     parser->usage("object", "remove");
 ;}
@@ -3111,8 +3119,8 @@ yyreduce:
 
   case 109:
 
-/* Line 1455 of yacc.c  */
-#line 526 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 526 "Grammar.y"
     {
     parser->findObject((yyvsp[(3) - (4)]));
 ;}
@@ -3120,8 +3128,8 @@ yyreduce:
 
   case 110:
 
-/* Line 1455 of yacc.c  */
-#line 530 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 530 "Grammar.y"
     {
     parser->usage("object", "find");
 ;}
@@ -3129,8 +3137,8 @@ yyreduce:
 
   case 111:
 
-/* Line 1455 of yacc.c  */
-#line 534 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 534 "Grammar.y"
     {
     parser->listObject((yyvsp[(3) - (4)]));
 ;}
@@ -3138,8 +3146,8 @@ yyreduce:
 
   case 112:
 
-/* Line 1455 of yacc.c  */
-#line 538 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 538 "Grammar.y"
     {
     parser->usage("object", "list");
 ;}
@@ -3147,8 +3155,8 @@ yyreduce:
 
   case 113:
 
-/* Line 1455 of yacc.c  */
-#line 542 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 542 "Grammar.y"
     {
     parser->describeObject((yyvsp[(3) - (4)]));
 ;}
@@ -3156,8 +3164,8 @@ yyreduce:
 
   case 114:
 
-/* Line 1455 of yacc.c  */
-#line 546 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 546 "Grammar.y"
     {
     parser->usage("object", "describe");
 ;}
@@ -3165,8 +3173,8 @@ yyreduce:
 
   case 115:
 
-/* Line 1455 of yacc.c  */
-#line 550 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 550 "Grammar.y"
     {
     parser->showCopying();
 ;}
@@ -3174,8 +3182,8 @@ yyreduce:
 
   case 116:
 
-/* Line 1455 of yacc.c  */
-#line 554 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 554 "Grammar.y"
     {
     parser->showWarranty();
 ;}
@@ -3183,8 +3191,8 @@ yyreduce:
 
   case 117:
 
-/* Line 1455 of yacc.c  */
-#line 558 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 558 "Grammar.y"
     {
     parser->usage((yyvsp[(2) - (3)]).front());
 ;}
@@ -3192,8 +3200,8 @@ yyreduce:
 
   case 118:
 
-/* Line 1455 of yacc.c  */
-#line 562 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 562 "Grammar.y"
     {
     if(((yyvsp[(2) - (4)]).front() == "server" || (yyvsp[(2) - (4)]).front() == "service") && (yyvsp[(3) - (4)]).front() == "template")
     {
@@ -3208,8 +3216,8 @@ yyreduce:
 
   case 119:
 
-/* Line 1455 of yacc.c  */
-#line 573 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 573 "Grammar.y"
     {
     parser->usage((yyvsp[(2) - (5)]).front(), (yyvsp[(3) - (5)]).front());
 ;}
@@ -3217,8 +3225,8 @@ yyreduce:
 
   case 120:
 
-/* Line 1455 of yacc.c  */
-#line 577 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 577 "Grammar.y"
     {
     if(((yyvsp[(2) - (5)]).front() == "server" || (yyvsp[(2) - (5)]).front() == "service") && (yyvsp[(3) - (5)]).front() == "template")
     {
@@ -3233,8 +3241,8 @@ yyreduce:
 
   case 121:
 
-/* Line 1455 of yacc.c  */
-#line 588 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 588 "Grammar.y"
     {
     if(((yyvsp[(2) - (6)]).front() == "server" || (yyvsp[(2) - (6)]).front() == "service") && (yyvsp[(3) - (6)]).front() == "template")
     {
@@ -3249,8 +3257,8 @@ yyreduce:
 
   case 122:
 
-/* Line 1455 of yacc.c  */
-#line 599 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 599 "Grammar.y"
     {
     parser->usage((yyvsp[(2) - (4)]).front());
 ;}
@@ -3258,8 +3266,8 @@ yyreduce:
 
   case 123:
 
-/* Line 1455 of yacc.c  */
-#line 603 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 603 "Grammar.y"
     {
     parser->usage();
 ;}
@@ -3267,8 +3275,8 @@ yyreduce:
 
   case 124:
 
-/* Line 1455 of yacc.c  */
-#line 607 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 607 "Grammar.y"
     {
     parser->usage((yyvsp[(1) - (3)]).front());
 ;}
@@ -3276,8 +3284,8 @@ yyreduce:
 
   case 125:
 
-/* Line 1455 of yacc.c  */
-#line 611 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 611 "Grammar.y"
     {
     (yyvsp[(1) - (4)]).push_back((yyvsp[(2) - (4)]).front());
     parser->invalidCommand((yyvsp[(1) - (4)]));
@@ -3287,8 +3295,8 @@ yyreduce:
 
   case 126:
 
-/* Line 1455 of yacc.c  */
-#line 617 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 617 "Grammar.y"
     {
     parser->invalidCommand((yyvsp[(1) - (3)]));
     yyerrok;
@@ -3297,8 +3305,8 @@ yyreduce:
 
   case 127:
 
-/* Line 1455 of yacc.c  */
-#line 622 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 622 "Grammar.y"
     {
     parser->invalidCommand((yyvsp[(1) - (3)]));
     yyerrok;
@@ -3307,8 +3315,8 @@ yyreduce:
 
   case 128:
 
-/* Line 1455 of yacc.c  */
-#line 627 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 627 "Grammar.y"
     {
     yyerrok;
 ;}
@@ -3316,16 +3324,16 @@ yyreduce:
 
   case 129:
 
-/* Line 1455 of yacc.c  */
-#line 631 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 631 "Grammar.y"
     {
 ;}
     break;
 
   case 130:
 
-/* Line 1455 of yacc.c  */
-#line 640 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 640 "Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
     (yyval).push_front((yyvsp[(1) - (2)]).front());
@@ -3334,8 +3342,8 @@ yyreduce:
 
   case 131:
 
-/* Line 1455 of yacc.c  */
-#line 645 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 645 "Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
     (yyval).push_front((yyvsp[(1) - (2)]).front());
@@ -3344,8 +3352,8 @@ yyreduce:
 
   case 132:
 
-/* Line 1455 of yacc.c  */
-#line 650 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 650 "Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (3)]);
     (yyval).push_front("help");
@@ -3355,8 +3363,8 @@ yyreduce:
 
   case 133:
 
-/* Line 1455 of yacc.c  */
-#line 656 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 656 "Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (3)]);
     (yyval).push_front("help");
@@ -3366,8 +3374,8 @@ yyreduce:
 
   case 134:
 
-/* Line 1455 of yacc.c  */
-#line 662 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 662 "Grammar.y"
     {
     (yyval) = YYSTYPE();
 ;}
@@ -3375,312 +3383,312 @@ yyreduce:
 
   case 135:
 
-/* Line 1455 of yacc.c  */
-#line 671 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 671 "Grammar.y"
     {
 ;}
     break;
 
   case 136:
 
-/* Line 1455 of yacc.c  */
-#line 674 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 674 "Grammar.y"
     {
 ;}
     break;
 
   case 137:
 
-/* Line 1455 of yacc.c  */
-#line 677 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 677 "Grammar.y"
     {
 ;}
     break;
 
   case 138:
 
-/* Line 1455 of yacc.c  */
-#line 680 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 680 "Grammar.y"
     {
 ;}
     break;
 
   case 139:
 
-/* Line 1455 of yacc.c  */
-#line 683 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 683 "Grammar.y"
     {
 ;}
     break;
 
   case 140:
 
-/* Line 1455 of yacc.c  */
-#line 686 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 686 "Grammar.y"
     {
 ;}
     break;
 
   case 141:
 
-/* Line 1455 of yacc.c  */
-#line 689 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 689 "Grammar.y"
     {
 ;}
     break;
 
   case 142:
 
-/* Line 1455 of yacc.c  */
-#line 692 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 692 "Grammar.y"
     {
 ;}
     break;
 
   case 143:
 
-/* Line 1455 of yacc.c  */
-#line 695 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 695 "Grammar.y"
     {
 ;}
     break;
 
   case 144:
 
-/* Line 1455 of yacc.c  */
-#line 698 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 698 "Grammar.y"
     {
 ;}
     break;
 
   case 145:
 
-/* Line 1455 of yacc.c  */
-#line 701 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 701 "Grammar.y"
     {
 ;}
     break;
 
   case 146:
 
-/* Line 1455 of yacc.c  */
-#line 704 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 704 "Grammar.y"
     {
 ;}
     break;
 
   case 147:
 
-/* Line 1455 of yacc.c  */
-#line 707 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 707 "Grammar.y"
     {
 ;}
     break;
 
   case 148:
 
-/* Line 1455 of yacc.c  */
-#line 710 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 710 "Grammar.y"
     {
 ;}
     break;
 
   case 149:
 
-/* Line 1455 of yacc.c  */
-#line 713 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 713 "Grammar.y"
     {
 ;}
     break;
 
   case 150:
 
-/* Line 1455 of yacc.c  */
-#line 716 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 716 "Grammar.y"
     {
 ;}
     break;
 
   case 151:
 
-/* Line 1455 of yacc.c  */
-#line 719 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 719 "Grammar.y"
     {
 ;}
     break;
 
   case 152:
 
-/* Line 1455 of yacc.c  */
-#line 722 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 722 "Grammar.y"
     {
 ;}
     break;
 
   case 153:
 
-/* Line 1455 of yacc.c  */
-#line 725 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 725 "Grammar.y"
     {
 ;}
     break;
 
   case 154:
 
-/* Line 1455 of yacc.c  */
-#line 728 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 728 "Grammar.y"
     {
 ;}
     break;
 
   case 155:
 
-/* Line 1455 of yacc.c  */
-#line 731 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 731 "Grammar.y"
     {
 ;}
     break;
 
   case 156:
 
-/* Line 1455 of yacc.c  */
-#line 734 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 734 "Grammar.y"
     {
 ;}
     break;
 
   case 157:
 
-/* Line 1455 of yacc.c  */
-#line 737 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 737 "Grammar.y"
     {
 ;}
     break;
 
   case 158:
 
-/* Line 1455 of yacc.c  */
-#line 740 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 740 "Grammar.y"
     {
 ;}
     break;
 
   case 159:
 
-/* Line 1455 of yacc.c  */
-#line 743 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 743 "Grammar.y"
     {
 ;}
     break;
 
   case 160:
 
-/* Line 1455 of yacc.c  */
-#line 746 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 746 "Grammar.y"
     {
 ;}
     break;
 
   case 161:
 
-/* Line 1455 of yacc.c  */
-#line 749 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 749 "Grammar.y"
     {
 ;}
     break;
 
   case 162:
 
-/* Line 1455 of yacc.c  */
-#line 752 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 752 "Grammar.y"
     {
 ;}
     break;
 
   case 163:
 
-/* Line 1455 of yacc.c  */
-#line 755 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 755 "Grammar.y"
     {
 ;}
     break;
 
   case 164:
 
-/* Line 1455 of yacc.c  */
-#line 758 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 758 "Grammar.y"
     {
 ;}
     break;
 
   case 165:
 
-/* Line 1455 of yacc.c  */
-#line 761 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 761 "Grammar.y"
     {
 ;}
     break;
 
   case 166:
 
-/* Line 1455 of yacc.c  */
-#line 764 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 764 "Grammar.y"
     {
 ;}
     break;
 
   case 167:
 
-/* Line 1455 of yacc.c  */
-#line 767 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 767 "Grammar.y"
     {
 ;}
     break;
 
   case 168:
 
-/* Line 1455 of yacc.c  */
-#line 770 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 770 "Grammar.y"
     {
 ;}
     break;
 
   case 169:
 
-/* Line 1455 of yacc.c  */
-#line 773 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 773 "Grammar.y"
     {
 ;}
     break;
 
   case 170:
 
-/* Line 1455 of yacc.c  */
-#line 776 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 776 "Grammar.y"
     {
 ;}
     break;
 
   case 171:
 
-/* Line 1455 of yacc.c  */
-#line 779 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 779 "Grammar.y"
     {
 ;}
     break;
 
   case 172:
 
-/* Line 1455 of yacc.c  */
-#line 782 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 782 "Grammar.y"
     {
 ;}
     break;
 
 
 
-/* Line 1455 of yacc.c  */
-#line 3684 "Grammar.tab.c"
+/* Line 1464 of yacc.c  */
+#line 3692 "Grammar.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
diff --git a/cpp/src/IceGrid/Grammar.h b/cpp/src/IceGrid/Grammar.h
index 6fc98140e72..8cc09c886d3 100644
--- a/cpp/src/IceGrid/Grammar.h
+++ b/cpp/src/IceGrid/Grammar.h
@@ -1,10 +1,9 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.4.3.  */
 
 /* Skeleton interface for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2009, 2010 Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/cpp/src/IceGrid/InternalRegistryI.cpp b/cpp/src/IceGrid/InternalRegistryI.cpp
index 02134635c90..8d5f7b081ed 100644
--- a/cpp/src/IceGrid/InternalRegistryI.cpp
+++ b/cpp/src/IceGrid/InternalRegistryI.cpp
@@ -7,6 +7,7 @@
 //
 // **********************************************************************
 
+#include <IceUtil/DisableWarnings.h>
 #include <Ice/Ice.h>
 
 #include <IceGrid/RegistryI.h>
diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak
index d77b5f2059f..f9e582fa235 100644
--- a/cpp/src/IceGrid/Makefile.mak
+++ b/cpp/src/IceGrid/Makefile.mak
@@ -129,8 +129,7 @@ $(NODE_SERVER): $(NODE_SVR_OBJS) IceGridNode.res
 Scanner.cpp : Scanner.l

 	flex Scanner.l

 	del /q $@

-	echo #include "IceUtil/Config.h" > Scanner.cpp

-	echo #include "stdint.h" >> Scanner.cpp

+	echo #include "IceUtil/ScannerConfig.h" >> Scanner.cpp

 	type lex.yy.c >> Scanner.cpp

 	del /q lex.yy.c

 

diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp
index 32143e1b138..e80d54408b1 100644
--- a/cpp/src/IceGrid/Parser.cpp
+++ b/cpp/src/IceGrid/Parser.cpp
@@ -2094,12 +2094,7 @@ Parser::getInput(char* buf, int& result, int maxSize)
         }
         else
         {
-#if defined(_MSC_VER) && _MSC_VER < 1500 && !defined(_STLP_MSVC)
-            // COMPILERBUG: Visual C++ defines min and max as macros
-            result = _MIN(maxSize, static_cast<int>(_commands.length()));
-#else
             result = min(maxSize, static_cast<int>(_commands.length()));
-#endif
             strncpy(buf, _commands.c_str(), result);
             _commands.erase(0, result);
             if(_commands.empty())
diff --git a/cpp/src/IceGrid/PlatformInfo.cpp b/cpp/src/IceGrid/PlatformInfo.cpp
index aae69f0d2c1..fc7e421159d 100644
--- a/cpp/src/IceGrid/PlatformInfo.cpp
+++ b/cpp/src/IceGrid/PlatformInfo.cpp
@@ -266,11 +266,7 @@ PlatformInfo::PlatformInfo(const string& prefix,
 
     switch(sysInfo.wProcessorArchitecture)
     {
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-    case 9: // PROCESSOR_ARCHITECTURE_AMD64
-#else
     case PROCESSOR_ARCHITECTURE_AMD64:
-#endif
         _machine = "x64";
         break;
     case PROCESSOR_ARCHITECTURE_IA64:
diff --git a/cpp/src/IceGrid/Scanner.cpp b/cpp/src/IceGrid/Scanner.cpp
index 3c7df338064..7a5103303c3 100644
--- a/cpp/src/IceGrid/Scanner.cpp
+++ b/cpp/src/IceGrid/Scanner.cpp
@@ -1,5 +1,4 @@
-#include <IceUtil/Config.h>
-#include <stdint.h>
+#include <IceUtil/ScannerConfig.h>
 
 #line 3 "lex.yy.c"
 
diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp
index df7bcd37325..d9be593a4af 100644
--- a/cpp/src/IceGrid/ServerCache.cpp
+++ b/cpp/src/IceGrid/ServerCache.cpp
@@ -7,6 +7,7 @@
 //
 // **********************************************************************
 
+#include <IceUtil/DisableWarnings.h>
 #include <Ice/LoggerUtil.h>
 #include <Ice/Communicator.h>
 #include <Ice/LocalException.h>
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index ea53de6b671..1eb80d965f3 100755
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.cpp
@@ -7,6 +7,7 @@
 //
 // **********************************************************************
 
+#include <IceUtil/DisableWarnings.h>
 #include <IceUtil/FileUtil.h>
 #include <Ice/Ice.h>
 #include <Ice/Instance.h>
diff --git a/cpp/src/IceGridLib/Makefile.mak b/cpp/src/IceGridLib/Makefile.mak
index eb94adce761..37fef840f63 100644
--- a/cpp/src/IceGridLib/Makefile.mak
+++ b/cpp/src/IceGridLib/Makefile.mak
@@ -41,11 +41,7 @@ CPPFLAGS        = -I.. $(CPPFLAGS)
 PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)

 !endif

 

-!if "$(BCPLUSPLUS)" == "yes"

-RES_FILE        = ,, IceGrid.res

-!else

 RES_FILE        = IceGrid.res

-!endif

 

 $(LIBNAME): $(DLLNAME)

 

@@ -74,12 +70,7 @@ install:: all
 	copy $(DLLNAME) "$(install_bindir)"

 

 

-!if "$(BCPLUSPLUS)" == "yes" && "$(OPTIMIZE)" != "yes"

-

-install:: all

-	copy $(DLLNAME:.dll=.tds) "$(install_bindir)"

-

-!elseif "$(GENERATE_PDB)" == "yes"

+!if "$(GENERATE_PDB)" == "yes"

 

 install:: all

 	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"

diff --git a/cpp/src/IcePatch2/FileServerI.cpp b/cpp/src/IcePatch2/FileServerI.cpp
index daec1f2216a..666b8d121de 100755
--- a/cpp/src/IcePatch2/FileServerI.cpp
+++ b/cpp/src/IcePatch2/FileServerI.cpp
@@ -106,7 +106,7 @@ IcePatch2::FileServerI::getFileCompressed_async(const AMD_FileServer_getFileComp
     }
 
     if(
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#if defined(_MSC_VER)
         _lseek(fd, static_cast<off_t>(pos), SEEK_SET)
 #else
         lseek(fd, static_cast<off_t>(pos), SEEK_SET)
@@ -127,13 +127,7 @@ IcePatch2::FileServerI::getFileCompressed_async(const AMD_FileServer_getFileComp
     IceUtil::ScopedArray<Byte> bytes(new Byte[num]);
 #ifdef _WIN32
     int r;
-    if((r =
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
-        _read(fd, bytes.get(), static_cast<unsigned int>(num))
-#else
-        read(fd, bytes.get(), static_cast<unsigned int>(num))
-#endif
-        ) == -1)
+    if((r = _read(fd, bytes.get(), static_cast<unsigned int>(num))) == -1)
 #else
     ssize_t r;
     if((r = read(fd, bytes.get(), static_cast<size_t>(num))) == -1)
diff --git a/cpp/src/IcePatch2Lib/Makefile.mak b/cpp/src/IcePatch2Lib/Makefile.mak
index d61460ea573..09fcc7c17ff 100755
--- a/cpp/src/IcePatch2Lib/Makefile.mak
+++ b/cpp/src/IcePatch2Lib/Makefile.mak
@@ -34,11 +34,7 @@ SLICE2CPPFLAGS	= --ice --include-dir IcePatch2 --dll-export ICE_PATCH2_API $(SLI
 PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)

 !endif

 

-!if "$(BCPLUSPLUS)" == "yes"

-RES_FILE        = ,, IcePatch2.res

-!else

 RES_FILE        = IcePatch2.res

-!endif

 

 $(LIBNAME): $(DLLNAME)

 

@@ -59,13 +55,7 @@ install:: all
 	copy $(LIBNAME) "$(install_libdir)"

 	copy $(DLLNAME) "$(install_bindir)"

 

-

-!if "$(BCPLUSPLUS)" == "yes" && "$(OPTIMIZE)" != "yes"

-

-install:: all

-	copy $(DLLNAME:.dll=.tds) "$(install_bindir)"

-

-!elseif "$(GENERATE_PDB)" == "yes"

+!if "$(GENERATE_PDB)" == "yes"

 

 install:: all

 	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"

diff --git a/cpp/src/IcePatch2Lib/Util.cpp b/cpp/src/IcePatch2Lib/Util.cpp
index 3f5713be7c1..7540d21864f 100755
--- a/cpp/src/IcePatch2Lib/Util.cpp
+++ b/cpp/src/IcePatch2Lib/Util.cpp
@@ -493,12 +493,7 @@ IcePatch2::readDirectory(const string& pa)
     const wstring fs = IceUtil::stringToWstring(simplify(path + "/*"));
 
     struct _wfinddata_t data;
-
-#  if defined(_MSC_VER) && (_MSC_VER < 1300)
-    long h = _wfindfirst(fs.c_str(), &data);
-#  else
     intptr_t h = _wfindfirst(fs.c_str(), &data);
-#  endif
     if(h == -1)
     {
         throw "cannot read directory `" + path + "':\n" + IceUtilInternal::lastErrorToString();
@@ -971,7 +966,7 @@ getFileInfoSeqInt(const string& basePath, const string& relPath, int compress, G
                     {
                         ByteSeq bytes(min(bytesLeft, 1024u*1024));
                         if(
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#if defined(_MSC_VER)
                             _read(fd, &bytes[0], static_cast<unsigned int>(bytes.size()))
 #else
                             read(fd, &bytes[0], static_cast<unsigned int>(bytes.size()))
diff --git a/cpp/src/IceSSL/AcceptorI.cpp b/cpp/src/IceSSL/AcceptorI.cpp
index f1b45d6afc7..fec3e89d09d 100644
--- a/cpp/src/IceSSL/AcceptorI.cpp
+++ b/cpp/src/IceSSL/AcceptorI.cpp
@@ -112,13 +112,7 @@ IceSSL::AcceptorI::startAccept()
     assert(_acceptFd == INVALID_SOCKET);
     _acceptFd = IceInternal::createSocket(false, _addr);
     const int sz = static_cast<int>(_acceptBuf.size() / 2);
-    if(!AcceptEx(_fd, _acceptFd, &_acceptBuf[0], 0, sz, sz, &_info.count,
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // COMPILER FIX: VC60
-                 reinterpret_cast<LPOVERLAPPED>(&_info)
-#else
-                 &_info
-#endif
-                 ))
+    if(!AcceptEx(_fd, _acceptFd, &_acceptBuf[0], 0, sz, sz, &_info.count, &_info))
     {
         if(!IceInternal::wouldBlock())
         {
diff --git a/cpp/src/IceSSL/EndpointI.cpp b/cpp/src/IceSSL/EndpointI.cpp
index 377a1af4013..d7a63a226ee 100644
--- a/cpp/src/IceSSL/EndpointI.cpp
+++ b/cpp/src/IceSSL/EndpointI.cpp
@@ -270,11 +270,8 @@ IceSSL::EndpointI::toString() const
     return s.str();
 }
 
-//
-// COMPILERFIX: VC6 complains about an ambiguous "EndpointInfo" symbol when this class is defined inside
-//              getInfo(). Moving the definition into an anonymous namespace works around it.
-//
-namespace
+Ice::EndpointInfoPtr
+IceSSL::EndpointI::getInfo() const
 {
     class InfoI : public IceSSL::EndpointInfo
     {
@@ -303,11 +300,6 @@ namespace
             return true;
         }
     };
-}
-
-Ice::EndpointInfoPtr
-IceSSL::EndpointI::getInfo() const
-{
     return new InfoI(_protocol, _encoding, _timeout, _compress, _host, _port);
 }
 
diff --git a/cpp/src/IceSSL/Makefile.mak b/cpp/src/IceSSL/Makefile.mak
index 85e4c3f1d00..d3967fadec0 100644
--- a/cpp/src/IceSSL/Makefile.mak
+++ b/cpp/src/IceSSL/Makefile.mak
@@ -43,11 +43,7 @@ LINKWITH        = $(OPENSSL_LIBS) $(LIBS) ws2_32.lib
 PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)

 !endif

 

-!if "$(BCPLUSPLUS)" == "yes"

-RES_FILE        = ,, IceSSL.res

-!else

 RES_FILE        = IceSSL.res

-!endif

 

 $(LIBNAME): $(DLLNAME)

 

@@ -68,12 +64,7 @@ install:: all
 	copy $(DLLNAME) "$(install_bindir)"

 

 

-!if "$(BCPLUSPLUS)" == "yes" && "$(OPTIMIZE)" != "yes"

-

-install:: all

-	copy $(DLLNAME:.dll=.tds) "$(install_bindir)"

-

-!elseif "$(GENERATE_PDB)" == "yes"

+!if "$(GENERATE_PDB)" == "yes"

 

 install:: all

 	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"

diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak
index c82dbab04a6..1e59d63ab50 100644
--- a/cpp/src/IceStorm/Makefile.mak
+++ b/cpp/src/IceStorm/Makefile.mak
@@ -85,8 +85,7 @@ $(ADMIN): $(AOBJS) IceStormAdmin.res
 Scanner.cpp: Scanner.l

 	flex Scanner.l

 	del /q $@

-	echo #include "IceUtil/Config.h" > Scanner.cpp

-	echo #include "stdint.h" >> Scanner.cpp

+	echo #include "IceUtil/ScannerConfig.h" >> Scanner.cpp

 	type lex.yy.c >> Scanner.cpp

 	del /q lex.yy.c

 

diff --git a/cpp/src/IceStorm/Parser.cpp b/cpp/src/IceStorm/Parser.cpp
index 3a638831bdd..8079cbd186a 100644
--- a/cpp/src/IceStorm/Parser.cpp
+++ b/cpp/src/IceStorm/Parser.cpp
@@ -372,7 +372,7 @@ Parser::current(const list<string>& args)
 void
 Parser::showBanner()
 {
-    cout << "Ice " << ICE_STRING_VERSION << "  Copyright 2003-2011 ZeroC, Inc." << endl;
+    cout << "Ice " << ICE_STRING_VERSION << "  Copyright 2003-2012 ZeroC, Inc." << endl;
 }
 
 void
@@ -386,12 +386,7 @@ Parser::getInput(char* buf, int& result, int maxSize)
         }
         else
         {
-#if defined(_MSC_VER) && _MSC_VER < 1500 && !defined(_STLP_MSVC)
-            // COMPILERBUG: Visual C++ defines min and max as macros
-            result = _MIN(maxSize, static_cast<int>(_commands.length()));
-#else
             result = min(maxSize, static_cast<int>(_commands.length()));
-#endif
             strncpy(buf, _commands.c_str(), result);
             _commands.erase(0, result);
             if(_commands.empty())
diff --git a/cpp/src/IceStorm/Scanner.cpp b/cpp/src/IceStorm/Scanner.cpp
index c1aaeef67a2..7c38d13adde 100644
--- a/cpp/src/IceStorm/Scanner.cpp
+++ b/cpp/src/IceStorm/Scanner.cpp
@@ -1,5 +1,4 @@
-#include <IceUtil/Config.h>
-#include <stdint.h>
+#include <IceUtil/ScannerConfig.h>
 
 #line 3 "lex.yy.c"
 
diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp
index dc08a60a364..35e0fe455dc 100644
--- a/cpp/src/IceStorm/TopicI.cpp
+++ b/cpp/src/IceStorm/TopicI.cpp
@@ -527,28 +527,6 @@ TopicImpl::getNonReplicatedPublisher() const
     }
 }
 
-//
-// COMPILERFIX: For some reason with VC6 find reports an error.
-//
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-namespace
-{
-vector<SubscriberPtr>::iterator
-find(vector<SubscriberPtr>::iterator start, vector<SubscriberPtr>::iterator end, const Ice::Identity& ident)
-{
-    while(start != end)
-    {
-        if(*start == ident)
-        {
-            return start;
-        }
-        ++start;
-    }
-    return end;
-}
-}
-#endif
-
 namespace
 {
 void
diff --git a/cpp/src/IceStorm/TransientTopicI.cpp b/cpp/src/IceStorm/TransientTopicI.cpp
index 38200312476..25ecb67e32c 100644
--- a/cpp/src/IceStorm/TransientTopicI.cpp
+++ b/cpp/src/IceStorm/TransientTopicI.cpp
@@ -165,28 +165,6 @@ TransientTopicImpl::getNonReplicatedPublisher(const Ice::Current&) const
     return _publisherPrx;
 }
 
-//
-// COMPILERFIX: For some reason with VC6 find reports an error.
-//
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-namespace
-{
-static vector<SubscriberPtr>::iterator
-find(vector<SubscriberPtr>::iterator start, vector<SubscriberPtr>::iterator end, const Ice::Identity& ident)
-{
-    while(start != end)
-    {
-        if(*start == ident)
-        {
-            return start;
-        }
-        ++start;
-    }
-    return end;
-}
-}
-#endif
-
 void
 TransientTopicImpl::subscribe(const QoS& origQoS, const Ice::ObjectPrx& obj, const Ice::Current&)
 {
diff --git a/cpp/src/IceStormLib/Makefile.mak b/cpp/src/IceStormLib/Makefile.mak
index 2cb3f7212d7..e4490d234f3 100644
--- a/cpp/src/IceStormLib/Makefile.mak
+++ b/cpp/src/IceStormLib/Makefile.mak
@@ -32,11 +32,7 @@ LINKWITH 	= $(LIBS) $(DBLINKWITH) icestorm$(LIBSUFFIX).lib icegrid$(LIBSUFFIX).l
 PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)

 !endif

 

-!if "$(BCPLUSPLUS)" == "yes"

-RES_FILE        = ,, IceStorm.res

-!else

 RES_FILE        = IceStorm.res

-!endif

 

 $(LIBNAME): $(DLLNAME)

 

@@ -56,12 +52,7 @@ install:: all
 	copy $(DLLNAME) "$(install_bindir)"

 

 

-!if "$(BCPLUSPLUS)" == "yes" && "$(OPTIMIZE)" != "yes"

-

-install:: all

-	copy $(DLLNAME:.dll=.tds) "$(install_bindir)"

-

-!elseif "$(GENERATE_PDB)" == "yes"

+!if "$(GENERATE_PDB)" == "yes"

 

 install:: all

 	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"

diff --git a/cpp/src/IceUtil/Cond.cpp b/cpp/src/IceUtil/Cond.cpp
index a0f71460f1e..e63405e7184 100644
--- a/cpp/src/IceUtil/Cond.cpp
+++ b/cpp/src/IceUtil/Cond.cpp
@@ -15,13 +15,34 @@
 
 #ifdef _WIN32
 
+#   ifdef ICE_HAS_WIN32_CONDVAR
+
+IceUtil::Cond::Cond()
+{
+    InitializeConditionVariable(&_cond);
+}
+
+IceUtil::Cond::~Cond()
+{
+}
+
+void
+IceUtil::Cond::signal()
+{
+    WakeConditionVariable(&_cond);
+}
+
+void
+IceUtil::Cond::broadcast()
+{
+    WakeAllConditionVariable(&_cond);
+}
+
+#   else
+
 IceUtilInternal::Semaphore::Semaphore(long initial)
 {
-#ifndef ICE_OS_WINRT
     _sem = CreateSemaphore(0, initial, 0x7fffffff, 0);
-#else
-    _sem = CreateSemaphoreExW(0, initial, 0x7fffffff, 0, 0, SEMAPHORE_ALL_ACCESS);
-#endif
     if(_sem == INVALID_HANDLE_VALUE)
     {
         throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
@@ -36,11 +57,7 @@ IceUtilInternal::Semaphore::~Semaphore()
 void
 IceUtilInternal::Semaphore::wait() const
 {
-#ifndef ICE_OS_WINRT
     DWORD rc = WaitForSingleObject(_sem, INFINITE);
-#else
-    DWORD rc = WaitForSingleObjectEx(_sem, INFINITE, true);
-#endif
     if(rc != WAIT_OBJECT_0)
     {
         throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
@@ -56,11 +73,7 @@ IceUtilInternal::Semaphore::timedWait(const IceUtil::Time& timeout) const
         throw IceUtil::InvalidTimeoutException(__FILE__, __LINE__, timeout);
     } 
 
-#ifndef ICE_OS_WINRT
     DWORD rc = WaitForSingleObject(_sem, static_cast<DWORD>(msTimeout));
-#else
-    DWORD rc = WaitForSingleObjectEx(_sem, static_cast<DWORD>(msTimeout), true);
-#endif
     if(rc != WAIT_TIMEOUT && rc != WAIT_OBJECT_0)
     {
         throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
@@ -305,6 +318,8 @@ IceUtil::Cond::timedDowait(const Time& timeout) const
     }
 }
 
+#    endif // ICE_HAS_WIN32_CONDVAR
+
 #else
 
 IceUtil::Cond::Cond()
diff --git a/cpp/src/IceUtil/FileUtil.cpp b/cpp/src/IceUtil/FileUtil.cpp
index b69e8d6b20a..9fe0a5f85d3 100644
--- a/cpp/src/IceUtil/FileUtil.cpp
+++ b/cpp/src/IceUtil/FileUtil.cpp
@@ -170,7 +170,7 @@ IceUtilInternal::unlink(const string& path)
 int
 IceUtilInternal::close(int fd)
 {
-#if defined(_MSC_VER) && (_MSC_VER >= 1400) || defined(__MINGW32__)
+#ifdef __MINGW32__
         return _close(fd);
 #else
         return ::close(fd);
@@ -208,7 +208,13 @@ IceUtilInternal::FileLock::FileLock(const std::string& path) :
     overlaped.InternalHigh = 0;
     overlaped.Offset = 0;
     overlaped.OffsetHigh = 0;
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1600)
     overlaped.hEvent = nullptr;
+#else
+    overlaped.hEvent = 0;
+#endif
+
     if(::LockFileEx(_fd, LOCKFILE_EXCLUSIVE_LOCK | LOCKFILE_FAIL_IMMEDIATELY, 0, 0, 0, &overlaped) == 0)
     {
         ::CloseHandle(_fd);
@@ -216,8 +222,8 @@ IceUtilInternal::FileLock::FileLock(const std::string& path) :
     }
 #endif
     //
-    // In Windows implementation we don't write the process pid to the file, as is 
-    // not posible to read the file from other process while it is locked here.
+    // In Windows implementation we don't write the process pid to the file, as it is 
+    // not possible to read the file from other process while it is locked here.
     //
 }
 
@@ -228,95 +234,10 @@ IceUtilInternal::FileLock::~FileLock()
     unlink(_path);
 }
 
-#ifdef _STLP_BEGIN_NAMESPACE
-namespace
-{
-int
-toFileFlags(ios_base::openmode mode)
-{
-    int flags = 0;
-    if(mode & ios_base::app)
-    {
-        flags |= _O_APPEND;
-    }
-    if(mode & ios_base::trunc)
-    {
-        flags |= _O_TRUNC;
-    }
-    if(mode & ios_base::binary)
-    {
-        flags |= _O_BINARY;
-    }
-    if((mode & ios_base::in) && !(mode & ios_base::out))
-    {
-        flags |= _O_RDONLY;
-    }
-    else if((mode & ios_base::out) && !(mode & ios_base::in))
-    {
-        flags |= _O_WRONLY | _O_CREAT;
-    }
-    else 
-    {
-        flags |= _O_RDWR;
-        if(mode & ios_base::trunc)
-        {
-            flags |= _O_CREAT;
-        }
-    }
-    return flags;
-}
-}
-#endif
-
 IceUtilInternal::ifstream::ifstream()
-#ifdef _STLP_BEGIN_NAMESPACE
-    : _fd(-1)
-#endif
-{
-}
-
-#ifdef _STLP_BEGIN_NAMESPACE
-
-IceUtilInternal::ifstream::ifstream(const string& path, ios_base::openmode mode) : _fd(-1)
-{
-    open(path, mode);
-}
-
-IceUtilInternal::ifstream::~ifstream()
-{
-    close();
-}
-
-void
-IceUtilInternal::ifstream::close()
 {
-    if(!rdbuf()->close())
-    {
-        setstate(ios_base::failbit);
-    }
-    if(_fd >= 0)
-    {
-        _close(_fd);
-    }
 }
 
-void
-IceUtilInternal::ifstream::open(const string& path, ios_base::openmode mode)
-{
-    mode |= ifstream::in;
-    _fd = IceUtilInternal::open(path, toFileFlags(mode));
-    if(_fd < 0 || !rdbuf()->open(_fd, mode))
-    {
-        setstate(ios_base::failbit);
-    }
-    if(mode & (ios_base::ate || ios_base::app))
-    {
-        seekg(ios_base::end);
-    }
-}
-
-#else
-
 IceUtilInternal::ifstream::ifstream(const string& path, ios_base::openmode mode) : 
 #ifdef  __MINGW32__
     std::ifstream(path.c_str(), mode)
@@ -336,57 +257,10 @@ IceUtilInternal::ifstream::open(const string& path, ios_base::openmode mode)
 #endif
 }
 
-#endif
-
 IceUtilInternal::ofstream::ofstream()
-#ifdef _STLP_BEGIN_NAMESPACE
-    : _fd(-1)
-#endif
-{
-}
-
-#ifdef _STLP_BEGIN_NAMESPACE
-
-IceUtilInternal::ofstream::ofstream(const string& path, ios_base::openmode mode) : _fd(-1)
-{
-    open(path, mode);
-}
-
-IceUtilInternal::ofstream::~ofstream()
 {
-    close();
 }
 
-void
-IceUtilInternal::ofstream::close()
-{
-    if(!rdbuf()->close())
-    {
-        setstate(ios_base::failbit);
-    }
-    if(_fd >= 0)
-    {
-        _close(_fd);
-    }
-}
-
-void
-IceUtilInternal::ofstream::open(const string& path, ios_base::openmode mode)
-{
-    mode |= ofstream::out;
-    _fd = IceUtilInternal::open(path, toFileFlags(mode));
-    if(_fd < 0 || !rdbuf()->open(_fd, mode))
-    {
-        setstate(ios_base::failbit);
-    }
-    if(mode & (ios_base::ate || ios_base::app))
-    {
-        seekp(ios_base::end);
-    }
-}
-
-#else
-
 IceUtilInternal::ofstream::ofstream(const string& path, ios_base::openmode mode) : 
 #ifdef __MINGW32__
     std::ofstream(path.c_str(), mode)
@@ -406,7 +280,6 @@ IceUtilInternal::ofstream::open(const string& path, ios_base::openmode mode)
 #endif
 }
 
-#endif
 
 #else
 
diff --git a/cpp/src/IceUtil/InputUtil.cpp b/cpp/src/IceUtil/InputUtil.cpp
index 8f5edab81f9..058331a0552 100644
--- a/cpp/src/IceUtil/InputUtil.cpp
+++ b/cpp/src/IceUtil/InputUtil.cpp
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#if (defined(_MSC_VER) && (_MSC_VER < 1300) ) || (__MINGW32__)
+#ifdef __MINGW32__
 #include <limits.h>
 #endif
 
@@ -26,10 +26,10 @@ namespace IceUtilInternal
 {
 
 
-#if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER < 1300))
+#ifdef __MINGW32__
 
 //
-// The VC60 runtime does not include _strtoi64, so we provide our own implementation
+// The MINGW runtime does not include _strtoi64, so we provide our own implementation
 //
 
 static const string allDigits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
@@ -179,7 +179,7 @@ Int64
 strToInt64(const char* s, char** endptr, int base)
 {
 #if defined(_WIN32)
-#   if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER < 1300))
+#   ifdef __MINGW32__
     return strToInt64Impl(s, endptr, base);
 #   else
     return _strtoi64(s, endptr, base);
diff --git a/cpp/src/IceUtil/Makefile.mak b/cpp/src/IceUtil/Makefile.mak
index 7afabd7afde..a4ec13cc6e3 100644
--- a/cpp/src/IceUtil/Makefile.mak
+++ b/cpp/src/IceUtil/Makefile.mak
@@ -46,11 +46,7 @@ CPPFLAGS        = $(CPPFLAGS) -DICE_UTIL_API_EXPORTS -I.. -DWIN32_LEAN_AND_MEAN
 PDBFLAGS	= /pdb:$(DLLNAME:.dll=.pdb)

 !endif

 

-!if "$(BCPLUSPLUS)" == "yes"

-RES_FILE	= ,, IceUtil.res

-!else

 RES_FILE	= IceUtil.res

-!endif

 

 !if "$(STATICLIBS)" == "yes"

 

@@ -80,13 +76,7 @@ install:: all
 	copy $(LIBNAME) "$(install_libdir)"

 	copy $(DLLNAME) "$(install_bindir)"

 

-

-!if "$(BCPLUSPLUS)" == "yes" && "$(OPTIMIZE)" != "yes"

-

-install:: all

-	copy $(DLLNAME:.dll=.tds) "$(install_bindir)"

-

-!elseif "$(GENERATE_PDB)" == "yes"

+!if "$(GENERATE_PDB)" == "yes"

 

 install:: all

 	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"

diff --git a/cpp/src/IceUtil/OutputUtil.cpp b/cpp/src/IceUtil/OutputUtil.cpp
index 989eb5bba9c..00464533d98 100644
--- a/cpp/src/IceUtil/OutputUtil.cpp
+++ b/cpp/src/IceUtil/OutputUtil.cpp
@@ -35,11 +35,7 @@ IceUtilInternal::int64ToString(Int64 val)
 {
     char buf[64];
 #ifdef _WIN32
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
     sprintf_s(buf, sizeof(buf), "%I64d", val);
-#else
-    sprintf(buf, "%I64d", val);
-#endif
 #elif defined(ICE_64)
     sprintf(buf, "%ld", val); // Avoids a format warning from GCC.
 #else
diff --git a/cpp/src/IceUtil/Random.cpp b/cpp/src/IceUtil/Random.cpp
index d47d424357f..f5bb19ba43b 100644
--- a/cpp/src/IceUtil/Random.cpp
+++ b/cpp/src/IceUtil/Random.cpp
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-#if defined(_MSC_VER) && (_MSC_VER > 1400)
+#ifdef _MSC_VER
 #  define _CRT_RAND_S
 #endif
 
@@ -25,7 +25,7 @@
 using namespace std;
 using namespace IceUtil;
 
-#if !defined(_WIN32) || !defined(_MSC_VER) || (_MSC_VER < 1400)
+#if !defined(_WIN32) || !defined(_MSC_VER)
 namespace
 {
 
@@ -88,7 +88,7 @@ IceUtilInternal::generateRandom(char* buffer, int size)
 {
 #ifdef _WIN32
 
-#  if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#  if defined(_MSC_VER)
     for(int i = 0; i < size; ++i)
     {
         buffer[i] = random(256);
@@ -168,7 +168,7 @@ unsigned int
 IceUtilInternal::random(int limit)
 {
     unsigned int r;
-#if defined(_MSC_VER) && (_MSC_VER > 1400)
+#if defined(_MSC_VER)
     errno_t err = rand_s(&r);
     if(err != 0)
     {
diff --git a/cpp/src/IceUtil/RecMutex.cpp b/cpp/src/IceUtil/RecMutex.cpp
index 9558a6fed2b..46209f55bc6 100644
--- a/cpp/src/IceUtil/RecMutex.cpp
+++ b/cpp/src/IceUtil/RecMutex.cpp
@@ -79,6 +79,21 @@ IceUtil::RecMutex::unlock() const
     }
 }
 
+#   ifdef ICE_HAS_WIN32_CONDVAR
+void
+IceUtil::RecMutex::unlock(LockState& state) const
+{
+    state.mutex = &_mutex;
+    state.count = _count;
+    _count = 0;
+}
+
+void
+IceUtil::RecMutex::lock(LockState& state) const
+{
+    _count = state.count;
+}
+#   else
 void
 IceUtil::RecMutex::unlock(LockState& state) const
 {
@@ -93,6 +108,7 @@ IceUtil::RecMutex::lock(LockState& state) const
     EnterCriticalSection(&_mutex);
     _count = state.count;
 }
+#   endif
 
 #else
 
diff --git a/cpp/src/IceUtil/Thread.cpp b/cpp/src/IceUtil/Thread.cpp
index 4c63bd7b0e2..fef17c9629d 100644
--- a/cpp/src/IceUtil/Thread.cpp
+++ b/cpp/src/IceUtil/Thread.cpp
@@ -181,11 +181,7 @@ WINAPI startHook(void* arg)
         {
             cerr << thread->name() << " terminating" << endl;
         }
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-        terminate();
-#else
         std::terminate();
-#endif
     }
 
     thread->_done();
diff --git a/cpp/src/IceXML/Makefile.mak b/cpp/src/IceXML/Makefile.mak
index d120aac00f9..3dadd991676 100644
--- a/cpp/src/IceXML/Makefile.mak
+++ b/cpp/src/IceXML/Makefile.mak
@@ -28,11 +28,7 @@ LINKWITH        = $(EXPAT_LIBS) $(BASELIBS)
 PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)

 !endif

 

-!if "$(BCPLUSPLUS)" == "yes"

-RES_FILE        = ,, IceXML.res

-!else

 RES_FILE        = IceXML.res

-!endif

 

 $(LIBNAME): $(DLLNAME)

 

@@ -51,12 +47,7 @@ install:: all
 	copy $(DLLNAME) "$(install_bindir)"

 

 

-!if "$(BCPLUSPLUS)" == "yes" && "$(OPTIMIZE)" != "yes"

-

-install:: all

-	copy $(DLLNAME:.dll=.tds) "$(install_bindir)"

-

-!elseif "$(GENERATE_PDB)" == "yes"

+!if "$(GENERATE_PDB)" == "yes"

 

 install:: all

 	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"

diff --git a/cpp/src/Makefile.mak b/cpp/src/Makefile.mak
index 0679c275d92..6f068a4d739 100644
--- a/cpp/src/Makefile.mak
+++ b/cpp/src/Makefile.mak
@@ -21,37 +21,18 @@ SUBDIRS		= IceUtil\winrt \
 !else

 SUBDIRS		= IceUtil \

 		  Slice \

-		  slice2cpp

-

-

-!if "$(CPP_COMPILER)" != "VC60"

-SUBDIRS		= $(SUBDIRS) \

-		  slice2freeze

-

-!if "$(BCPLUSPLUS)" != "yes"

-SUBDIRS		= $(SUBDIRS) \

+		  slice2cpp \

+		  slice2freeze \

 		  slice2cs \

 		  slice2freezej \

 		  slice2java \

 		  slice2py \

-		  slice2html

-!endif

-

-!endif

-

-!if "$(BCPLUSPLUS)" != "yes"

-SUBDIRS		= $(SUBDIRS) \

+		  slice2html \

 		  slice2php \

-		  slice2rb

-!endif

-

-SUBDIRS		= $(SUBDIRS) \

+		  slice2rb \

 		  Ice \

 		  IceSSL \

-		  ca

-

-!if "$(CPP_COMPILER)" != "VC60"

-SUBDIRS		= $(SUBDIRS) \

+		  ca \

 		  IceXML \

 		  Freeze \

 		  FreezeScript \

@@ -59,9 +40,6 @@ SUBDIRS		= $(SUBDIRS) \
 		  Glacier2Lib \

 		  IceStormLib \

 		  IceGridLib \

-

-!if "$(BCPLUSPLUS)" != "yes"

-SUBDIRS		= $(SUBDIRS) \

 		  IceBox \

 		  IcePatch2 \

 		  Glacier2 \

@@ -69,9 +47,6 @@ SUBDIRS		= $(SUBDIRS) \
 		  IceStorm \

 		  IceGrid \

                   iceserviceinstall

-!endif

-

-!endif

 

 !endif

 

diff --git a/cpp/src/Slice/FileTracker.cpp b/cpp/src/Slice/FileTracker.cpp
index 0c97b35f448..a14638757a2 100644
--- a/cpp/src/Slice/FileTracker.cpp
+++ b/cpp/src/Slice/FileTracker.cpp
@@ -40,11 +40,7 @@ Slice::FileException::ice_name() const
 void
 Slice::FileException::ice_print(ostream& out) const
 {
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-    Exception::ice_print(out);
-#else
     IceUtil::Exception::ice_print(out);
-#endif
     out << ": " << _reason;
 }
 
diff --git a/cpp/src/Slice/Makefile.mak b/cpp/src/Slice/Makefile.mak
index 4ebe8c06c6d..2d90e21eb18 100644
--- a/cpp/src/Slice/Makefile.mak
+++ b/cpp/src/Slice/Makefile.mak
@@ -41,11 +41,7 @@ CPPFLAGS	= -I.. -Idummyinclude $(CPPFLAGS) -DSLICE_API_EXPORTS  -DWIN32_LEAN_AND
 PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)

 !endif

 

-!if "$(BCPLUSPLUS)" == "yes"

-RES_FILE        = ,, Slice.res

-!else

 RES_FILE        = Slice.res

-!endif

 

 !if "$(STATICLIBS)" == "yes"

 

@@ -71,8 +67,7 @@ $(DLLNAME): $(OBJS) Slice.res
 Scanner.cpp : Scanner.l

 	flex Scanner.l

 	del /q $@

-	echo #include "IceUtil/Config.h" > Scanner.cpp

-	echo #include "stdint.h" >> Scanner.cpp

+	echo #include "IceUtil/ScannerConfig.h" >> Scanner.cpp

 	type lex.yy.c >> Scanner.cpp

 	del /q lex.yy.c

 

@@ -91,12 +86,7 @@ install:: all
 	copy $(DLLNAME) "$(install_bindir)"

 

 

-!if "$(BCPLUSPLUS)" == "yes" && "$(OPTIMIZE)" != "yes"

-

-install:: all

-	copy $(DLLNAME:.dll=.tds) "$(install_bindir)"

-

-!elseif "$(GENERATE_PDB)" == "yes"

+!if "$(GENERATE_PDB)" == "yes"

 

 install:: all

 	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"

diff --git a/cpp/src/Slice/Scanner.cpp b/cpp/src/Slice/Scanner.cpp
index f18e3165c68..54541891c2e 100644
--- a/cpp/src/Slice/Scanner.cpp
+++ b/cpp/src/Slice/Scanner.cpp
@@ -1,5 +1,4 @@
-#include <IceUtil/Config.h>
-#include <stdint.h>
+#include <IceUtil/ScannerConfig.h>
 #line 2 "lex.yy.c"
 
 #line 4 "lex.yy.c"
diff --git a/cpp/src/iceserviceinstall/ServiceInstaller.cpp b/cpp/src/iceserviceinstall/ServiceInstaller.cpp
index 2aeece3d32f..0eb36071ddb 100644
--- a/cpp/src/iceserviceinstall/ServiceInstaller.cpp
+++ b/cpp/src/iceserviceinstall/ServiceInstaller.cpp
@@ -7,25 +7,13 @@
 //
 // **********************************************************************
 
-#define _WIN32_WINNT 0x0500
-
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-#    define _CRT_SECURE_NO_DEPRECATE 1  // C4996 '<C function>' was declared deprecated
-#endif
-
+#include <IceUtil/DisableWarnings.h>
 #include <ServiceInstaller.h>
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/FileUtil.h>
 
-
 #include <Aclapi.h>
-
-#if defined(_MSC_VER) && _MSC_VER >= 1300
-//
-// The VC6 headers don't include Sddl.h
-//
 #include <Sddl.h>
-#endif
 
 using namespace std;
 using namespace Ice;
@@ -475,13 +463,10 @@ IceServiceInstaller::initializeSid(const string& name)
     if(_debug)
     {
         Trace trace(_communicator->getLogger(), "IceServiceInstaller");
-
-#if defined(_MSC_VER) && _MSC_VER >= 1300
         wchar_t* sidString = 0;
         ConvertSidToStringSidW(_sid.get(), &sidString);
         trace << "SID: " << IceUtil::wstringToString(sidString) << "; ";
         LocalFree(sidString);
-#endif
         trace << "Full name: " << _sidName;
     }
 }
diff --git a/cpp/src/iceserviceinstall/ServiceInstaller.h b/cpp/src/iceserviceinstall/ServiceInstaller.h
index 3c852931e9e..8efa7d3287e 100644
--- a/cpp/src/iceserviceinstall/ServiceInstaller.h
+++ b/cpp/src/iceserviceinstall/ServiceInstaller.h
@@ -15,20 +15,11 @@
 class IceServiceInstaller
 {
 public:
-
-#if defined(_MSC_VER) && _MSC_VER < 1300
-    enum { 
-        icegridregistry = 0, 
-        icegridnode = 1,
-        glacier2router = 2,
-        serviceCount = 3
-    };
-#else
+    
     static const int icegridregistry = 0;
     static const int icegridnode = 1;
     static const int glacier2router = 2;
     static const int serviceCount = 3;
-#endif
 
     IceServiceInstaller(int, const std::string&, const Ice::CommunicatorPtr&);
 
diff --git a/cpp/src/slice2confluence/Gen.cpp b/cpp/src/slice2confluence/Gen.cpp
index 32aa163edd3..42425db59cd 100755
--- a/cpp/src/slice2confluence/Gen.cpp
+++ b/cpp/src/slice2confluence/Gen.cpp
@@ -7,10 +7,6 @@
 //
 // **********************************************************************
 
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-#    define _CRT_SECURE_NO_DEPRECATE 1  // C4996 '<C function>' was declared deprecated
-#endif
-
 #include <IceUtil/DisableWarnings.h>
 #include <IceUtil/Functional.h>
 #include <IceUtil/StringUtil.h>
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 00bc50a0512..70adaf19199 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -1415,18 +1415,8 @@ Slice::Gen::TypesVisitor::visitConst(const ConstPtr& p)
 void
 Slice::Gen::TypesVisitor::emitUpcall(const ExceptionPtr& base, const string& call, bool isLocal)
 {
-    C.zeroIndent();
-    C << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-    C.restoreIndent();
-    C << nl << (base ? fixKwd(base->name()) : string(isLocal ? "LocalException" : "UserException")) << call;
-    C.zeroIndent();
-    C << nl << "#else";
-    C.restoreIndent();
     C << nl << (base ? fixKwd(base->scoped()) : string(isLocal ? "::Ice::LocalException" : "::Ice::UserException"))
       << call;
-    C.zeroIndent();
-    C << nl << "#endif";
-    C.restoreIndent();
 }
 
 Slice::Gen::ProxyDeclVisitor::ProxyDeclVisitor(Output& h, Output& c, const string& dllExport) :
@@ -1635,18 +1625,7 @@ Slice::Gen::ProxyVisitor::visitClassDefEnd(const ClassDefPtr& p)
 
     H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_context(const ::Ice::Context& __context) const";
     H << sb;
-    H.dec();
-    H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-    H.inc();
-    H << nl << "typedef ::IceProxy::Ice::Object _Base;";
-    H << nl << "return dynamic_cast<" << name << "*>(_Base::ice_context(__context).get());";
-    H.dec();
-    H << nl << "#else";
-    H.inc();
     H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_context(__context).get());";
-    H.dec();
-    H << nl << "#endif";
-    H.inc();
     H << eb;
 
     //
@@ -1655,298 +1634,98 @@ Slice::Gen::ProxyVisitor::visitClassDefEnd(const ClassDefPtr& p)
 
     H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_adapterId(const ::std::string& __id) const";
     H << sb;
-    H.dec();
-    H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-    H.inc();
-    H << nl << "typedef ::IceProxy::Ice::Object _Base;";
-    H << nl << "return dynamic_cast<" << name << "*>(_Base::ice_adapterId(__id).get());";
-    H.dec();
-    H << nl << "#else";
-    H.inc();
     H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());";
-    H.dec();
-    H << nl << "#endif";
-    H.inc();
     H << eb;
 
     H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_endpoints(const ::Ice::EndpointSeq& __endpoints) const";
     H << sb;
-    H.dec();
-    H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-    H.inc();
-    H << nl << "typedef ::IceProxy::Ice::Object _Base;";
-    H << nl << "return dynamic_cast<" << name << "*>(_Base::ice_endpoints(__endpoints).get());";
-    H.dec();
-    H << nl << "#else";
-    H.inc();
     H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_endpoints(__endpoints).get());";
-    H.dec();
-    H << nl << "#endif";
-    H.inc();
     H << eb;
 
     H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_locatorCacheTimeout(int __timeout) const";
     H << sb;
-    H.dec();
-    H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-    H.inc();
-    H << nl << "typedef ::IceProxy::Ice::Object _Base;";
-    H << nl << "return dynamic_cast<" << name << "*>(_Base::ice_locatorCacheTimeout(__timeout).get());";
-    H.dec();
-    H << nl << "#else";
-    H.inc();
     H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_locatorCacheTimeout(__timeout).get());";
-    H.dec();
-    H << nl << "#endif";
-    H.inc();
     H << eb;
 
     H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_connectionCached(bool __cached) const";
     H << sb;
-    H.dec();
-    H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-    H.inc();
-    H << nl << "typedef ::IceProxy::Ice::Object _Base;";
-    H << nl << "return dynamic_cast<" << name << "*>(_Base::ice_connectionCached(__cached).get());";
-    H.dec();
-    H << nl << "#else";
-    H.inc();
     H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_connectionCached(__cached).get());";
-    H.dec(); H << nl << "#endif"; H.inc();
     H << eb;
 
     H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_endpointSelection(::Ice::EndpointSelectionType __est) const";
     H << sb;
-    H.dec();
-    H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-    H.inc();
-    H << nl << "typedef ::IceProxy::Ice::Object _Base;";
-    H << nl << "return dynamic_cast<" << name << "*>(_Base::ice_endpointSelection(__est).get());";
-    H.dec();
-    H << nl << "#else";
-    H.inc();
     H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_endpointSelection(__est).get());";
-    H.dec();
-    H << nl << "#endif";
-    H.inc();
     H << eb;
 
     H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_secure(bool __secure) const";
     H << sb;
-    H.dec();
-    H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-    H.inc();
-    H << nl << "typedef ::IceProxy::Ice::Object _Base;";
-    H << nl << "return dynamic_cast<" << name << "*>(_Base::ice_secure(__secure).get());";
-    H.dec();
-    H << nl << "#else";
-    H.inc();
     H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_secure(__secure).get());";
-    H.dec();
-    H << nl << "#endif";
-    H.inc();
     H << eb;
 
     H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_preferSecure(bool __preferSecure) const";
     H << sb;
-    H.dec();
-    H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-    H.inc();
-    H << nl << "typedef ::IceProxy::Ice::Object _Base;";
-    H << nl << "return dynamic_cast<" << name << "*>(_Base::ice_preferSecure(__preferSecure).get());";
-    H.dec();
-    H << nl << "#else";
-    H.inc();
     H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_preferSecure(__preferSecure).get());";
-    H.dec();
-    H << nl << "#endif";
-    H.inc();
     H << eb;
 
     H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_router(const ::Ice::RouterPrx& __router) const";
     H << sb;
-    H.dec();
-    H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-    H.inc();
-    H << nl << "typedef ::IceProxy::Ice::Object _Base;";
-    H << nl << "return dynamic_cast<" << name << "*>(_Base::ice_router(__router).get());";
-    H.dec();
-    H << nl << "#else";
-    H.inc();
     H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_router(__router).get());";
-    H.dec();
-    H << nl << "#endif";
-    H.inc();
     H << eb;
 
     H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_locator(const ::Ice::LocatorPrx& __locator) const";
     H << sb;
-    H.dec(); H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-    H.inc();
-    H << nl << "typedef ::IceProxy::Ice::Object _Base;";
-    H << nl << "return dynamic_cast<" << name << "*>(_Base::ice_locator(__locator).get());";
-    H.dec();
-    H << nl << "#else";
-    H.inc();
     H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_locator(__locator).get());";
-    H.dec();
-    H << nl << "#endif";
-    H.inc();
     H << eb;
 
     H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_collocationOptimized(bool __co) const";
     H << sb;
-    H.dec(); H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-    H.inc();
-    H << nl << "typedef ::IceProxy::Ice::Object _Base;";
-    H << nl << "return dynamic_cast<" << name << "*>(_Base::ice_collocationOptimized(__co).get());";
-    H.dec(); H << nl << "#else"; H.inc();
     H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_collocationOptimized(__co).get());";
-    H.dec(); H << nl << "#endif"; H.inc();
     H << eb;
 
     H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_twoway() const";
     H << sb;
-    H.dec();
-    H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-    H.inc();
-    H << nl << "typedef ::IceProxy::Ice::Object _Base;";
-    H << nl << "return dynamic_cast<" << name << "*>(_Base::ice_twoway().get());";
-    H.dec();
-    H << nl << "#else";
-    H.inc();
     H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_twoway().get());";
-    H.dec();
-    H << nl << "#endif";
-    H.inc();
     H << eb;
 
     H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_oneway() const";
     H << sb;
-    H.dec();
-    H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-    H.inc();
-    H << nl << "typedef ::IceProxy::Ice::Object _Base;";
-    H << nl << "return dynamic_cast<" << name << "*>(_Base::ice_oneway().get());";
-    H.dec();
-    H << nl << "#else"; H.inc();
     H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_oneway().get());";
-    H.dec();
-    H << nl << "#endif";
-    H.inc();
     H << eb;
 
     H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_batchOneway() const";
     H << sb;
-    H.dec();
-    H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-    H.inc();
-    H << nl << "typedef ::IceProxy::Ice::Object _Base;";
-    H << nl << "return dynamic_cast<" << name << "*>(_Base::ice_batchOneway().get());";
-    H.dec();
-    H << nl << "#else";
-    H.inc();
     H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_batchOneway().get());";
-    H.dec();
-    H << nl << "#endif";
-    H.inc();
     H << eb;
 
     H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_datagram() const";
     H << sb;
-    H.dec();
-    H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-    H.inc();
-    H << nl << "typedef ::IceProxy::Ice::Object _Base;";
-    H << nl << "return dynamic_cast<" << name << "*>(_Base::ice_datagram().get());";
-    H.dec();
-    H << nl << "#else";
-    H.inc();
     H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_datagram().get());";
-    H.dec();
-    H << nl << "#endif";
-    H.inc();
     H << eb;
 
     H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_batchDatagram() const";
     H << sb;
-    H.dec();
-    H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-    H.inc();
-    H << nl << "typedef ::IceProxy::Ice::Object _Base;";
-    H << nl << "return dynamic_cast<" << name << "*>(_Base::ice_batchDatagram().get());";
-    H.dec();
-    H << nl << "#else";
-    H.inc();
     H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_batchDatagram().get());";
-    H.dec();
-    H << nl << "#endif";
-    H.inc();
     H << eb;
 
     H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_compress(bool __compress) const";
     H << sb;
-    H.dec();
-    H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-    H.inc();
-    H << nl << "typedef ::IceProxy::Ice::Object _Base;";
-    H << nl << "return dynamic_cast<" << name << "*>(_Base::ice_compress(__compress).get());";
-    H.dec();
-    H << nl << "#else";
-    H.inc();
     H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_compress(__compress).get());";
-    H.dec();
-    H << nl << "#endif";
-    H.inc();
     H << eb;
 
     H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_timeout(int __timeout) const";
     H << sb;
-    H.dec();
-    H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-    H.inc();
-    H << nl << "typedef ::IceProxy::Ice::Object _Base;";
-    H << nl << "return dynamic_cast<" << name << "*>(_Base::ice_timeout(__timeout).get());";
-    H.dec();
-    H << nl << "#else";
-    H.inc();
     H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());";
-    H.dec();
-    H << nl << "#endif";
-    H.inc();
     H << eb;
 
     H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_connectionId(const ::std::string& __id) const";
     H << sb;
-    H.dec();
-    H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-    H.inc();
-    H << nl << "typedef ::IceProxy::Ice::Object _Base;";
-    H << nl << "return dynamic_cast<" << name << "*>(_Base::ice_connectionId(__id).get());";
-    H.dec();
-    H << nl << "#else";
-    H.inc();
     H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_connectionId(__id).get());";
-    H.dec();
-    H << nl << "#endif";
-    H.inc();
     H << eb;
 
     H << nl << nl << "::IceInternal::ProxyHandle<" << name
       << "> ice_encodingVersion(const ::Ice::EncodingVersion& __v) const";
     H << sb;
-    H.dec();
-    H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-    H.inc();
-    H << nl << "typedef ::IceProxy::Ice::Object _Base;";
-    H << nl << "return dynamic_cast<" << name << "*>(_Base::ice_encodingVersion(__v).get());";
-    H.dec();
-    H << nl << "#else";
-    H.inc();
     H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_encodingVersion(__v).get());";
-    H.dec();
-    H << nl << "#endif";
-    H.inc();
     H << eb;
 
     H << nl << nl << _dllExport << "static const ::std::string& ice_staticId();";
@@ -4764,18 +4543,8 @@ Slice::Gen::ObjectVisitor::emitVirtualBaseInitializers(const ClassDefPtr& p, boo
     }
     upcall += ")";
 
-    H.zeroIndent();
-    H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug";
-    H.restoreIndent();
-    H << nl << fixKwd(p->name()) << upcall;
-    H.zeroIndent();
-    H << nl << "#else";
-    H.restoreIndent();
     H << nl << fixKwd(p->scoped()) << upcall;
-    H.zeroIndent();
-    H << nl << "#endif";
     H << nl;
-    H.restoreIndent();
 
     return true;
 }
@@ -5142,38 +4911,12 @@ Slice::Gen::AsyncCallbackTemplateVisitor::generateOperation(const OperationPtr&
         H << eb;
         H << nl << "catch(::Ice::Exception& ex)";
         H << sb;
-	H.zeroIndent();
-	H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-	H.restoreIndent();
-        H << nl << "__exception(__result, ex);";
-	H.zeroIndent();
-	H << nl << "#else";
-	H.restoreIndent();
+
         H << nl << "" << baseD << "::__exception(__result, ex);";
-	H.zeroIndent();
-	H << nl << "#endif";
-	H.restoreIndent();
         H << nl << "return;";
         H << eb;
         H << nl << "if(response)";
         H << sb;
-	H.zeroIndent();
-	H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-	H.restoreIndent();
-        H << nl << "(callback.get()->*response)" << spar;
-        if(ret)
-        {
-            H << "__ret";
-        }
-        H << outArgs;
-        if(withCookie)
-        {
-            H << "CT::dynamicCast(__result->getCookie())";
-        }
-        H << epar << ';';
-	H.zeroIndent();
-	H << nl << "#else";
-	H.restoreIndent();
         H << nl << "(" << baseD << "::callback.get()->*response)" << spar;
         if(ret)
         {
@@ -5185,9 +4928,6 @@ Slice::Gen::AsyncCallbackTemplateVisitor::generateOperation(const OperationPtr&
             H << "CT::dynamicCast(__result->getCookie())";
         }
         H << epar << ';';
-	H.zeroIndent();
-	H << nl << "#endif";
-	H.restoreIndent();
         H << eb;
         H << eb;
         
@@ -5813,17 +5553,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
         H << eb;
         H << nl << "void __sent(bool sentSynchronously)";
         H << sb;
-        H.zeroIndent();
-        H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-        H.restoreIndent();
-        H << nl << "AMICallbackBase::__sent(sentSynchronously);";
-        H.zeroIndent();
-        H << nl << "#else";
-        H.restoreIndent();
         H << nl << "::Ice::AMICallbackBase::__sent(sentSynchronously);";
-        H.zeroIndent();
-        H << nl << "#endif";
-        H.restoreIndent();
         H << eb;
         H << eb << ';';
         H << sp << nl << "typedef ::IceUtil::Handle< " << classScopedAMI << '_' << name << "> " << classNameAMI
@@ -6064,17 +5794,7 @@ Slice::Gen::AsyncImplVisitor::visitOperation(const OperationPtr& p)
         }
         C << nl << "else";
         C << sb;
-        C.zeroIndent();
-        C << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-        C.restoreIndent();
-        C << nl << "IncomingAsync::ice_exception(ex);";
-        C.zeroIndent();
-        C << nl << "#else";
-        C.restoreIndent();
         C << nl << "::IceInternal::IncomingAsync::ice_exception(ex);";
-        C.zeroIndent();
-        C << nl << "#endif";
-        C.restoreIndent();
         C << eb;
         C << eb;
     }
diff --git a/cpp/src/slice2cpp/Makefile.mak b/cpp/src/slice2cpp/Makefile.mak
index 128e4f135a2..f6a4b8cf365 100644
--- a/cpp/src/slice2cpp/Makefile.mak
+++ b/cpp/src/slice2cpp/Makefile.mak
@@ -26,11 +26,7 @@ CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
 PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)

 !endif

 

-!if "$(BCPLUSPLUS)" == "yes"

-RES_FILE        = ,, Slice2Cpp.res

-!else

 RES_FILE        = Slice2Cpp.res

-!endif

 

 $(NAME): $(OBJS) Slice2Cpp.res

 	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib \

@@ -45,13 +41,7 @@ clean::
 install:: all

 	copy $(NAME) "$(install_bindir)"

 

-

-!if "$(BCPLUSPLUS)" == "yes" && "$(OPTIMIZE)" != "yes"

-

-install:: all

-	copy $(NAME:.exe=.tds) "$(install_bindir)"

-

-!elseif "$(GENERATE_PDB)" == "yes"

+!if "$(GENERATE_PDB)" == "yes"

 

 install:: all

 	copy $(NAME:.exe=.pdb) "$(install_bindir)"

diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index 0053fd2a01f..f636b758a77 100644
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -28,20 +28,8 @@
 
 using namespace std;
 using namespace Slice;
-
-//
-// Don't use "using namespace IceUtil", or VC++ 6.0 complains about
-// ambigious symbols for constructs like
-// "IceUtil::constMemFun(&Slice::Exception::isLocal)".
-//
-using IceUtilInternal::Output;
-using IceUtilInternal::nl;
-using IceUtilInternal::sp;
-using IceUtilInternal::sb;
-using IceUtilInternal::eb;
-using IceUtilInternal::spar;
-using IceUtilInternal::epar;
-using IceUtilInternal::trim;
+using namespace IceUtil;
+using namespace IceUtilInternal;
 
 static string // Should be an anonymous namespace, but VC++ 6 can't handle that.
 sliceModeToIceMode(Operation::Mode opMode)
@@ -189,9 +177,9 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
     // when inlining is on. The code below issues a warning: better
     // than an error!
     //
-    transform(allBases.begin(), allBases.end(), back_inserter(ids), ::IceUtil::constMemFun<string,ClassDef>(&Contained::scoped));
+    transform(allBases.begin(), allBases.end(), back_inserter(ids), constMemFun<string,ClassDef>(&Contained::scoped));
 #else
-    transform(allBases.begin(), allBases.end(), back_inserter(ids), ::IceUtil::constMemFun(&Contained::scoped));
+    transform(allBases.begin(), allBases.end(), back_inserter(ids), constMemFun(&Contained::scoped));
 #endif
 
     StringList other;
@@ -615,9 +603,9 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
         //
         // See comment for transform above
         //
-        transform(allOps.begin(), allOps.end(), back_inserter(allOpNames), ::IceUtil::constMemFun<string,Operation>(&Contained::name));
+        transform(allOps.begin(), allOps.end(), back_inserter(allOpNames), constMemFun<string,Operation>(&Contained::name));
 #else
-        transform(allOps.begin(), allOps.end(), back_inserter(allOpNames), ::IceUtil::constMemFun(&Contained::name));
+        transform(allOps.begin(), allOps.end(), back_inserter(allOpNames), constMemFun(&Contained::name));
 #endif
         allOpNames.push_back("ice_id");
         allOpNames.push_back("ice_ids");
@@ -2026,7 +2014,7 @@ Slice::Gen::generateChecksums(const UnitPtr& u)
     ChecksumMap map = createChecksums(u);
     if(!map.empty())
     {
-        string className = "X" + IceUtil::generateUUID();
+        string className = "X" + generateUUID();
         for(string::size_type pos = 1; pos < className.size(); ++pos)
         {
             if(!isalnum(static_cast<unsigned char>(className[pos])))
diff --git a/cpp/src/slice2freeze/Makefile.mak b/cpp/src/slice2freeze/Makefile.mak
index bc719caf140..8e30ff02eda 100644
--- a/cpp/src/slice2freeze/Makefile.mak
+++ b/cpp/src/slice2freeze/Makefile.mak
@@ -25,11 +25,7 @@ CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
 PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)

 !endif

 

-!if "$(BCPLUSPLUS)" == "yes"

-RES_FILE        = ,, Slice2Freeze.res

-!else

 RES_FILE        = Slice2Freeze.res

-!endif

 

 $(NAME): $(OBJS) Slice2Freeze.res

 	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib \

@@ -45,12 +41,7 @@ install:: all
 	copy $(NAME) "$(install_bindir)"

 

 

-!if "$(BCPLUSPLUS)" == "yes" && "$(OPTIMIZE)" != "yes"

-

-install:: all

-	copy $(NAME:.exe=.tds) "$(install_bindir)"

-

-!elseif "$(GENERATE_PDB)" == "yes"

+!if "$(GENERATE_PDB)" == "yes"

 

 install:: all

 	copy $(NAME:.exe=.pdb) "$(install_bindir)"

diff --git a/cpp/src/slice2html/Gen.cpp b/cpp/src/slice2html/Gen.cpp
index 91298ba7b5c..08eed8b4cf6 100755
--- a/cpp/src/slice2html/Gen.cpp
+++ b/cpp/src/slice2html/Gen.cpp
@@ -7,10 +7,6 @@
 //
 // **********************************************************************
 
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-#    define _CRT_SECURE_NO_DEPRECATE 1  // C4996 '<C function>' was declared deprecated
-#endif
-
 #include <IceUtil/DisableWarnings.h>
 #include <IceUtil/Functional.h>
 #include <IceUtil/StringUtil.h>
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 472acac73f7..3f0c23c2aca 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -21,19 +21,8 @@
 
 using namespace std;
 using namespace Slice;
-
-//
-// Don't use "using namespace IceUtil", or VC++ 6.0 complains
-// about ambiguous symbols for constructs like
-// "IceUtil::constMemFun(&Slice::Exception::isLocal)".
-//
-using IceUtilInternal::Output;
-using IceUtilInternal::nl;
-using IceUtilInternal::sp;
-using IceUtilInternal::sb;
-using IceUtilInternal::eb;
-using IceUtilInternal::spar;
-using IceUtilInternal::epar;
+using namespace IceUtil;
+using namespace IceUtilInternal;
 
 static string
 sliceModeToIceMode(Operation::Mode opMode)
@@ -830,7 +819,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
 
     ClassList allBases = p->allBases();
     StringList ids;
-    transform(allBases.begin(), allBases.end(), back_inserter(ids), ::IceUtil::constMemFun(&Contained::scoped));
+    transform(allBases.begin(), allBases.end(), back_inserter(ids), constMemFun(&Contained::scoped));
     StringList other;
     other.push_back(scoped);
     other.push_back("::Ice::Object");
@@ -840,7 +829,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
     StringList::const_iterator firstIter = ids.begin();
     StringList::const_iterator scopedIter = find(ids.begin(), ids.end(), scoped);
     assert(scopedIter != ids.end());
-    StringList::difference_type scopedPos = IceUtilInternal::distance(firstIter, scopedIter);
+    StringList::difference_type scopedPos = ::IceUtilInternal::distance(firstIter, scopedIter);
 
     out << sp << nl << "public static final String[] __ids =";
     out << sb;
@@ -1298,7 +1287,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
     if(!allOps.empty())
     {
         StringList allOpNames;
-        transform(allOps.begin(), allOps.end(), back_inserter(allOpNames), ::IceUtil::constMemFun(&Contained::name));
+        transform(allOps.begin(), allOps.end(), back_inserter(allOpNames), constMemFun(&Contained::name));
         allOpNames.push_back("ice_id");
         allOpNames.push_back("ice_ids");
         allOpNames.push_back("ice_isA");
@@ -3102,11 +3091,11 @@ Slice::Gen::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p)
         }
         else
         {
-            IceUtil::Int64 v = 0;
+            Int64 v = 0;
             serialVersionUID = serialVersionUID.substr(pos);
             if(serialVersionUID != "0")
             {
-                if(!IceUtilInternal::stringToInt64(serialVersionUID, v)) // conversion error
+                if(!stringToInt64(serialVersionUID, v)) // conversion error
                 {
                     ostringstream os;
                     os << "ignoring invalid serialVersionUID for class `" << p->scoped()
@@ -3874,11 +3863,11 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
         }
         else
         {
-            IceUtil::Int64 v = 0;
+            Int64 v = 0;
             serialVersionUID = serialVersionUID.substr(pos);
             if(serialVersionUID != "0")
             {
-                if(!IceUtilInternal::stringToInt64(serialVersionUID, v)) // conversion error
+                if(!stringToInt64(serialVersionUID, v)) // conversion error
                 {
                     ostringstream os;
                     os << "ignoring invalid serialVersionUID for struct `" << p->scoped()
@@ -4943,7 +4932,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
 
     ClassList allBases = p->allBases();
     StringList ids;
-    transform(allBases.begin(), allBases.end(), back_inserter(ids), ::IceUtil::constMemFun(&Contained::scoped));
+    transform(allBases.begin(), allBases.end(), back_inserter(ids), constMemFun(&Contained::scoped));
     StringList other;
     other.push_back(scoped);
     other.push_back("::Ice::Object");
@@ -4953,7 +4942,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
     StringList::const_iterator firstIter = ids.begin();
     StringList::const_iterator scopedIter = find(ids.begin(), ids.end(), scoped);
     assert(scopedIter != ids.end());
-    StringList::difference_type scopedPos = IceUtilInternal::distance(firstIter, scopedIter);
+    StringList::difference_type scopedPos = ::IceUtilInternal::distance(firstIter, scopedIter);
 
     out << sp << nl << "public static final String[] __ids =";
     out << sb;