Added FixedProxyException

14 files changed, 89 insertions, 66 deletions

diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index 6f25a08def5..b090f88b013 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -648,3 +648,10 @@ Ice::SecurityException::ice_print(ostream& out) const
 	out << ":\n" << reason;
     }
 }
+
+void
+Ice::FixedProxyException::ice_print(ostream& out) const
+{
+    Exception::ice_print(out);
+    out << ":\nfixed proxy exception";
+}
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index 11b33cf6c56..9a7aab95a3d 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -489,25 +489,25 @@ IceInternal::FixedReference::getEndpointSelection() const
 ReferencePtr
 IceInternal::FixedReference::changeSecure(bool) const
 {
-    return FixedReferencePtr(const_cast<FixedReference*>(this));
+    throw FixedProxyException(__FILE__, __LINE__);
 }
 
 ReferencePtr
 IceInternal::FixedReference::changeRouter(const RouterPrx&) const
 {
-    return FixedReferencePtr(const_cast<FixedReference*>(this));
+    throw FixedProxyException(__FILE__, __LINE__);
 }
 
 ReferencePtr
 IceInternal::FixedReference::changeLocator(const LocatorPrx&) const
 {
-    return FixedReferencePtr(const_cast<FixedReference*>(this));
+    throw FixedProxyException(__FILE__, __LINE__);
 }
 
 ReferencePtr
 IceInternal::FixedReference::changeCollocationOptimization(bool) const
 {
-    return FixedReferencePtr(const_cast<FixedReference*>(this));
+    throw FixedProxyException(__FILE__, __LINE__);
 }
 
 ReferencePtr
@@ -516,61 +516,61 @@ IceInternal::FixedReference::changeCompress(bool) const
     // TODO: FixedReferences should probably have a _compress flag,
     // that gets its default from the fixed connection this reference
     // refers to. This should be changable with changeCompress().
-    return FixedReferencePtr(const_cast<FixedReference*>(this));
+    throw FixedProxyException(__FILE__, __LINE__);
 }
 
 ReferencePtr
 IceInternal::FixedReference::changeTimeout(int) const
 {
-    return FixedReferencePtr(const_cast<FixedReference*>(this));
+    throw FixedProxyException(__FILE__, __LINE__);
 }
 
 ReferencePtr
 IceInternal::FixedReference::changeConnectionId(const string&) const
 {
-    return FixedReferencePtr(const_cast<FixedReference*>(this));
+    throw FixedProxyException(__FILE__, __LINE__);
 }
 
 ReferencePtr
 IceInternal::FixedReference::changeLocatorCacheTimeout(int) const
 {
-    return FixedReferencePtr(const_cast<FixedReference*>(this));
+    throw FixedProxyException(__FILE__, __LINE__);
 }
 
 ReferencePtr
 IceInternal::FixedReference::changeAdapterId(const string& newAdapterId) const
 {
-    return FixedReferencePtr(const_cast<FixedReference*>(this));    
+    throw FixedProxyException(__FILE__, __LINE__);
 }
 
 ReferencePtr
 IceInternal::FixedReference::changeEndpoints(const vector<EndpointIPtr>& newEndpoints) const
 {
-    return FixedReferencePtr(const_cast<FixedReference*>(this));    
+    throw FixedProxyException(__FILE__, __LINE__);
 }
 
 ReferencePtr
 IceInternal::FixedReference::changeCacheConnection(bool) const
 {
-    return FixedReferencePtr(const_cast<FixedReference*>(this));    
+    throw FixedProxyException(__FILE__, __LINE__);
 }
 
 ReferencePtr
 IceInternal::FixedReference::changeEndpointSelection(EndpointSelectionType) const
 {
-    return FixedReferencePtr(const_cast<FixedReference*>(this));
+    throw FixedProxyException(__FILE__, __LINE__);
 }
 
 void
 IceInternal::FixedReference::streamWrite(BasicStream* s) const
 {
-    throw MarshalException(__FILE__, __LINE__, "Cannot marshal a fixed proxy");
+    throw FixedProxyException(__FILE__, __LINE__);
 }
 
 string
 IceInternal::FixedReference::toString() const
 {
-    throw MarshalException(__FILE__, __LINE__, "Cannot marshal a fixed proxy");
+    throw FixedProxyException(__FILE__, __LINE__);
 
     assert(false);   // Cannot be reached.
     return string(); // To keep the compiler from complaining.
diff --git a/cpp/src/IceGrid/AdminSessionI.cpp b/cpp/src/IceGrid/AdminSessionI.cpp
index cfe57adc0db..e1b31d4e98f 100644
--- a/cpp/src/IceGrid/AdminSessionI.cpp
+++ b/cpp/src/IceGrid/AdminSessionI.cpp
@@ -58,11 +58,16 @@ AdminSessionI::setObservers(const RegistryObserverPrx& registryObserver,
 	throw ex;
     }
 
-    setupObserverSubscription(RegistryObserverTopicName, registryObserver);
-    setupObserverSubscription(NodeObserverTopicName, nodeObserver);
-    setupObserverSubscription(ApplicationObserverTopicName, appObserver);
-    setupObserverSubscription(AdapterObserverTopicName, adapterObserver);
-    setupObserverSubscription(ObjectObserverTopicName, objectObserver);
+    setupObserverSubscription(RegistryObserverTopicName, 
+    			      registryObserver ? registryObserver->ice_timeout(_timeout * 1000) : 0);
+    setupObserverSubscription(NodeObserverTopicName, 
+    			      nodeObserver ? nodeObserver->ice_timeout(_timeout * 1000) : 0);
+    setupObserverSubscription(ApplicationObserverTopicName, 
+    			      appObserver ? appObserver->ice_timeout(_timeout * 1000) : 0);
+    setupObserverSubscription(AdapterObserverTopicName,
+    			      adapterObserver ? adapterObserver->ice_timeout(_timeout * 1000) : 0);
+    setupObserverSubscription(ObjectObserverTopicName, 
+    			      objectObserver ? objectObserver->ice_timeout(_timeout * 1000) : 0);
 }
 
 void
@@ -286,7 +291,7 @@ AdminSessionI::setupObserverSubscription(TopicName name, const Ice::ObjectPrx& o
 
     if(observer)
     {
-	_observers[name] = observer->ice_timeout(_timeout * 1000);
+	_observers[name] = observer;
 	_database->getObserverTopic(name)->subscribe(_observers[name]); 
     }
 }
diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp
index ca7d1d6a40c..83fe8c11903 100644
--- a/cpp/src/slice2cpp/Main.cpp
+++ b/cpp/src/slice2cpp/Main.cpp
@@ -98,20 +98,21 @@ main(int argc, char* argv[])
 
     string cppArgs;
     vector<string> optargs = opts.argVec("D");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    vector<string>::const_iterator i;
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	cppArgs += " -D\"" + *i + "\"";
     }
 
     optargs = opts.argVec("U");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	cppArgs += " -U\"" + *i + "\"";
     }
 
     vector<string> includePaths;
     includePaths = opts.argVec("I");
-    for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
+    for(i = includePaths.begin(); i != includePaths.end(); ++i)
     {
 	cppArgs += " -I\"" + *i + "\"";
     }
@@ -147,7 +148,7 @@ main(int argc, char* argv[])
 
     int status = EXIT_SUCCESS;
 
-    for(vector<string>::const_iterator i = args.begin(); i != args.end(); ++i)
+    for(i = args.begin(); i != args.end(); ++i)
     {
 	if(depend)
 	{
diff --git a/cpp/src/slice2cppe/Main.cpp b/cpp/src/slice2cppe/Main.cpp
index f015f8a88b3..70d76cfd2fa 100644
--- a/cpp/src/slice2cppe/Main.cpp
+++ b/cpp/src/slice2cppe/Main.cpp
@@ -94,19 +94,20 @@ main(int argc, char* argv[])
 
     string cppArgs;
     vector<string> optargs = opts.argVec("D");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    vector<string>::const_iterator i;
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	cppArgs += " -D\"" + *i + "\"";
     }
 
     optargs = opts.argVec("U");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	cppArgs += " -U\"" + *i + "\"";
     }
 
     vector<string> includePaths = opts.argVec("I");
-    for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
+    for(i = includePaths.begin(); i != includePaths.end(); ++i)
     {
 	cppArgs += " -I\"" + *i + "\"";
     }
@@ -138,7 +139,7 @@ main(int argc, char* argv[])
 
     int status = EXIT_SUCCESS;
 
-    for(vector<string>::const_iterator i = args.begin(); i != args.end(); ++i)
+    for(i = args.begin(); i != args.end(); ++i)
     {
 	if(depend)
 	{
diff --git a/cpp/src/slice2cs/Main.cpp b/cpp/src/slice2cs/Main.cpp
index f096462a198..8bebaabbe25 100644
--- a/cpp/src/slice2cs/Main.cpp
+++ b/cpp/src/slice2cs/Main.cpp
@@ -87,19 +87,20 @@ main(int argc, char* argv[])
 
     string cppArgs;
     vector<string> optargs = opts.argVec("D");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    vector<string>::const_iterator i;
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	cppArgs += " -D\"" + *i + "\"";
     }
 
     optargs = opts.argVec("U");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	cppArgs += " -U\"" + *i + "\"";
     }
 
     vector<string> includePaths = opts.argVec("I");
-    for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
+    for(i = includePaths.begin(); i != includePaths.end(); ++i)
     {
 	cppArgs += " -I\"" + *i + "\"";
     }
@@ -142,7 +143,7 @@ main(int argc, char* argv[])
 
     int status = EXIT_SUCCESS;
 
-    for(vector<string>::const_iterator i = args.begin(); i != args.end(); ++i)
+    for(i = args.begin(); i != args.end(); ++i)
     {
 	if(depend)
 	{
diff --git a/cpp/src/slice2docbook/Main.cpp b/cpp/src/slice2docbook/Main.cpp
index 7ab115bc62b..257ffe6667c 100644
--- a/cpp/src/slice2docbook/Main.cpp
+++ b/cpp/src/slice2docbook/Main.cpp
@@ -83,19 +83,20 @@ main(int argc, char* argv[])
 
     string cppArgs;
     vector<string> optargs = opts.argVec("D");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    vector<string>::const_iterator i;
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	cppArgs += " -D\"" + *i + "\"";
     }
 
     optargs = opts.argVec("U");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	cppArgs += " -U\"" + *i + "\"";
     }
 
     optargs = opts.argVec("I");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	cppArgs += " -I\"" + *i + "\"";
     }
diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp
index 98c0875405f..986eb48d485 100644
--- a/cpp/src/slice2freeze/Main.cpp
+++ b/cpp/src/slice2freeze/Main.cpp
@@ -1226,19 +1226,20 @@ main(int argc, char* argv[])
     string cppArgs;
     vector<string> extraHeaders = opts.argVec("add-header");
     vector<string> optargs = opts.argVec("D");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    vector<string>::const_iterator i;
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	cppArgs += " -D\"" + *i + "\"";
     }
 
     optargs = opts.argVec("U");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	cppArgs += " -U\"" + *i + "\"";
     }
 
     vector<string> includePaths = opts.argVec("I");
-    for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
+    for(i = includePaths.begin(); i != includePaths.end(); ++i)
     {
 	cppArgs += " -I\"" + *i + "\"";
     }
@@ -1251,7 +1252,7 @@ main(int argc, char* argv[])
 
     vector<Dict> dicts;
     optargs = opts.argVec("dict");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	string s = *i;
 	s.erase(remove_if(s.begin(), s.end(), ::isspace), s.end());
@@ -1384,7 +1385,7 @@ main(int argc, char* argv[])
     
     vector<Index> indices;
     optargs = opts.argVec("index");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	string s = *i;
 	s.erase(remove_if(s.begin(), s.end(), ::isspace), s.end());
@@ -1451,7 +1452,7 @@ main(int argc, char* argv[])
     }
 
     optargs = opts.argVec("dict-index");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	string s = *i;
 	s.erase(remove_if(s.begin(), s.end(), ::isspace), s.end());
diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp
index 8c8c6735310..c229ca0ed1f 100644
--- a/cpp/src/slice2freezej/Main.cpp
+++ b/cpp/src/slice2freezej/Main.cpp
@@ -1117,19 +1117,20 @@ main(int argc, char* argv[])
 
     string cppArgs;
     vector<string> optargs = opts.argVec("D");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    vector<string>::const_iterator i;
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	cppArgs += " -D\"" + *i + "\"";
     }
 
     optargs = opts.argVec("U");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	cppArgs += " -U\"" + *i + "\"";
     }
 
     vector<string> includePaths = opts.argVec("I");
-    for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
+    for(i = includePaths.begin(); i != includePaths.end(); ++i)
     {
 	cppArgs += " -I\"" + *i + "\"";
     }
@@ -1140,7 +1141,7 @@ main(int argc, char* argv[])
 
     vector<Dict> dicts;
     optargs = opts.argVec("dict");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	string s = *i;
 	s.erase(remove_if(s.begin(), s.end(), ::isspace), s.end());
@@ -1188,7 +1189,7 @@ main(int argc, char* argv[])
 
     vector<Index> indices;
     optargs = opts.argVec("index");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	string s = *i;
 	s.erase(remove_if(s.begin(), s.end(), ::isspace), s.end());
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index 8148956dd91..98eeb83202d 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -93,19 +93,20 @@ main(int argc, char* argv[])
 
     string cppArgs;
     vector<string> optargs = opts.argVec("D");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    vector<string>::const_iterator i;
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	cppArgs += " -D\"" + *i + "\"";
     }
 
     optargs = opts.argVec("U");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	cppArgs += " -U\"" + *i + "\"";
     }
 
     vector<string> includePaths = opts.argVec("I");
-    for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
+    for(i = includePaths.begin(); i != includePaths.end(); ++i)
     {
 	cppArgs += " -I\"" + *i + "\"";
     }
@@ -154,7 +155,7 @@ main(int argc, char* argv[])
 
     ChecksumMap checksums;
 
-    for(vector<string>::const_iterator i = args.begin(); i != args.end(); ++i)
+    for(i = args.begin(); i != args.end(); ++i)
     {
 	if(depend)
 	{
diff --git a/cpp/src/slice2javae/Main.cpp b/cpp/src/slice2javae/Main.cpp
index a5b71a01607..a43da812fab 100644
--- a/cpp/src/slice2javae/Main.cpp
+++ b/cpp/src/slice2javae/Main.cpp
@@ -83,19 +83,20 @@ main(int argc, char* argv[])
 
     string cppArgs;
     vector<string> optargs = opts.argVec("D");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    vector<string>::const_iterator i;
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	cppArgs += " -D\"" + *i + "\"";
     }
 
     optargs = opts.argVec("U");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	cppArgs += " -U\"" + *i + "\"";
     }
 
     vector<string> includePaths = opts.argVec("I");
-    for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
+    for(i = includePaths.begin(); i != includePaths.end(); ++i)
     {
 	cppArgs += " -I\"" + *i + "\"";
     }
@@ -134,7 +135,7 @@ main(int argc, char* argv[])
 
     int status = EXIT_SUCCESS;
 
-    for(vector<string>::const_iterator i = args.begin(); i != args.end(); ++i)
+    for(i = args.begin(); i != args.end(); ++i)
     {
 	if(depend)
 	{
diff --git a/cpp/src/slice2py/Main.cpp b/cpp/src/slice2py/Main.cpp
index c0ecd103ddf..9e4def18ab9 100644
--- a/cpp/src/slice2py/Main.cpp
+++ b/cpp/src/slice2py/Main.cpp
@@ -426,19 +426,20 @@ main(int argc, char* argv[])
 
     string cppArgs;
     vector<string> optargs = opts.argVec("D");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    vector<string>::const_iterator i;
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	cppArgs += " -D\"" + *i + "\"";
     }
 
     optargs = opts.argVec("U");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	cppArgs += " -U\"" + *i + "\"";
     }
 
     vector<string> includePaths = opts.argVec("I");
-    for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
+    for(i = includePaths.begin(); i != includePaths.end(); ++i)
     {
 	cppArgs += " -I\"" + *i + "\"";
     }
@@ -470,7 +471,7 @@ main(int argc, char* argv[])
 
     int status = EXIT_SUCCESS;
 
-    for(vector<string>::const_iterator i = args.begin(); i != args.end(); ++i)
+    for(i = args.begin(); i != args.end(); ++i)
     {
         Preprocessor icecpp(argv[0], *i, cppArgs);
         FILE* cppHandle = icecpp.preprocess(false);
diff --git a/cpp/src/slice2rb/Main.cpp b/cpp/src/slice2rb/Main.cpp
index fdf2d4c4ae9..f0769a2890b 100644
--- a/cpp/src/slice2rb/Main.cpp
+++ b/cpp/src/slice2rb/Main.cpp
@@ -94,19 +94,20 @@ main(int argc, char* argv[])
 
     string cppArgs;
     vector<string> optargs = opts.argVec("D");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    vector<string>::const_iterator i;
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	cppArgs += " -D" + *i;
     }
 
     optargs = opts.argVec("U");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	cppArgs += " -U" + *i;
     }
 
     vector<string> includePaths = opts.argVec("I");
-    for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
+    for(i = includePaths.begin(); i != includePaths.end(); ++i)
     {
 	cppArgs += " -I" + *i;
     }
@@ -134,7 +135,7 @@ main(int argc, char* argv[])
 
     int status = EXIT_SUCCESS;
 
-    for(vector<string>::const_iterator i = args.begin(); i != args.end(); ++i)
+    for(i = args.begin(); i != args.end(); ++i)
     {
         Preprocessor icecpp(argv[0], *i, cppArgs);
         FILE* cppHandle = icecpp.preprocess(false);
diff --git a/cpp/src/slice2vb/Main.cpp b/cpp/src/slice2vb/Main.cpp
index a4baad2ebb9..35b15a95bfb 100644
--- a/cpp/src/slice2vb/Main.cpp
+++ b/cpp/src/slice2vb/Main.cpp
@@ -87,19 +87,20 @@ main(int argc, char* argv[])
 
     string cppArgs;
     vector<string> optargs = opts.argVec("D");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    vector<string>::const_iterator i;
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	cppArgs += " -D\"" + *i + "\"";
     }
 
     optargs = opts.argVec("U");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
+    for(i = optargs.begin(); i != optargs.end(); ++i)
     {
 	cppArgs += " -U\"" + *i + "\"";
     }
 
     vector<string> includePaths = opts.argVec("I");
-    for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
+    for(i = includePaths.begin(); i != includePaths.end(); ++i)
     {
 	cppArgs += " -I\"" + *i + "\"";
     }
@@ -142,7 +143,7 @@ main(int argc, char* argv[])
 
     int status = EXIT_SUCCESS;
 
-    for(vector<string>::const_iterator i = args.begin(); i != args.end(); ++i)
+    for(i = args.begin(); i != args.end(); ++i)
     {
 	if(depend)
 	{