Fix for bug 282:

- Adding Ice.Default.CollocationOptimization property, default = 1
- Changing the ice_default proxy method to return a proxy having the
    default collocation optimization setting, rather than false
- Changing all other calls to ReferenceFactory::create to use the default
    setting instead of a hard-coded value

1 files changed, 1 insertions, 0 deletions

diff --git a/cpp/src/Ice/DefaultsAndOverrides.h b/cpp/src/Ice/DefaultsAndOverrides.h
index 1a55e221879..f7f19261c0b 100644
--- a/cpp/src/Ice/DefaultsAndOverrides.h
+++ b/cpp/src/Ice/DefaultsAndOverrides.h
@@ -27,6 +27,7 @@ public:
     std::string defaultProtocol;
     std::string defaultRouter;
     std::string defaultLocator;
+    bool defaultCollocationOptimization;
 
     bool overrideTimeout;
     Ice::Int overrideTimeoutValue;