- Fixed bug 4521: it's now possible to build the tests & demos against

  C:\Program Files\ZeroC\Ice-3.4b. To support this, new .depend.mak
  files were added.
- Fixed nmake install to support installing Ice in C:\Program Files.
- Fixed bug 4569: test/IceUtil/inputUtil VC6 compilation failure.
- Updated all dependencies.
- Fixed C# slice2cs compiler options for all C# demo makefiles (no need
  for --ice or extra -I options)
- Fixed nmake install for 64 bits build of Ice for Python (we now correctly
  install IcePy in the x64 subdir).
- Demos and tests builds will now look for Ice in
  C:\Program Files\ZeroC\Ice-3.4b by default is ICE_HOME isn't set (or
  C:\Program Files (x86)\ZeroC\Ice-3.4b)

1 files changed, 5 insertions, 1 deletions

diff --git a/cpp/test/IceUtil/inputUtil/Client.cpp b/cpp/test/IceUtil/inputUtil/Client.cpp
index 4a710f7f56d..a8e4c59eef1 100644
--- a/cpp/test/IceUtil/inputUtil/Client.cpp
+++ b/cpp/test/IceUtil/inputUtil/Client.cpp
@@ -212,7 +212,8 @@ main(int, char**)
         ss.clear();
         test(IceUtilInternal::splitString(":a:b:", ":", ss) && ss.size() == 2 && ss[0] == "a" && ss[1] == "b");
         ss.clear();
-        
+
+#if defined(_MSC_VER) && _MSC_VER >= 1300 // COMPILERBUG: VC++ 6 doesn't like escaped quotes
         test(IceUtilInternal::splitString("\"a\"", ":", ss) && ss.size() == 1 && ss[0] == "a");
         ss.clear();
         test(IceUtilInternal::splitString("\"a\":b", ":", ss) && ss.size() == 2 && ss[0] == "a" && ss[1] == "b");
@@ -223,6 +224,7 @@ main(int, char**)
         ss.clear();
         test(IceUtilInternal::splitString("a=\"a:b\"", ":", ss) && ss.size() == 1 && ss[0] == "a=a:b");
         ss.clear();
+#endif
 
         test(IceUtilInternal::splitString("'a'", ":", ss) && ss.size() == 1 && ss[0] == "a");
         ss.clear();
@@ -231,6 +233,7 @@ main(int, char**)
         test(IceUtilInternal::splitString("\"'a\"", ":", ss) && ss.size() == 1 && ss[0] == "'a");
         ss.clear();
 
+#if defined(_MSC_VER) && _MSC_VER >= 1300 // COMPILERBUG: VC++ 6 doesn't like escaped quotes
         test(IceUtilInternal::splitString("a\\'b", ":", ss) && ss.size() == 1 && ss[0] == "a'b");
         ss.clear();
         test(IceUtilInternal::splitString("'a:b\\'c'", ":", ss) && ss.size() == 1 && ss[0] == "a:b'c");
@@ -243,6 +246,7 @@ main(int, char**)
         ss.clear();
         test(IceUtilInternal::splitString("\"a:b'c\"", ":", ss) && ss.size() == 1 && ss[0] == "a:b'c");
         ss.clear();
+#endif
 
         test(!IceUtilInternal::splitString("a\"b", ":", ss));
     }