String literals fixes

- Fixed escape sequences in C++ wide strings
- Fixed objetive-c escape sequences
- Update ruby to use magic comments to set the file encoding

4 files changed, 8 insertions, 0 deletions

diff --git a/python/test/Ice/operations/ServerAMD.py b/python/test/Ice/operations/ServerAMD.py
index 3561221335a..63611ff1ed8 100755
--- a/python/test/Ice/operations/ServerAMD.py
+++ b/python/test/Ice/operations/ServerAMD.py
@@ -409,6 +409,9 @@ class MyDerivedClassI(Test.MyDerivedClass):
                 Test.sw0, Test.sw1, Test.sw2, Test.sw3, Test.sw4, Test.sw5, Test.sw6, Test.sw7, Test.sw8, Test.sw9, Test.sw10,
                 Test.ss0, Test.ss1, Test.ss2, Test.ss3, Test.ss4, Test.ss5,
                 Test.su0, Test.su1, Test.su2])
+    
+    def opWStringLiterals_async(self, cb, current=None):
+        return self.opStringLiterals_async(cb, current)
 
 def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp")
diff --git a/python/test/Ice/operations/Test.ice b/python/test/Ice/operations/Test.ice
index 7f5ec510834..b0d9f02380e 100644
--- a/python/test/Ice/operations/Test.ice
+++ b/python/test/Ice/operations/Test.ice
@@ -248,6 +248,7 @@ class MyClass
     ByteBoolD opByteBoolD2(ByteBoolD byteBoolD);
     
     StringS opStringLiterals();
+    StringS opWStringLiterals();
 };
 
 struct MyStruct1
diff --git a/python/test/Ice/operations/TestAMD.ice b/python/test/Ice/operations/TestAMD.ice
index ba567612d60..4bb71e8a3cb 100644
--- a/python/test/Ice/operations/TestAMD.ice
+++ b/python/test/Ice/operations/TestAMD.ice
@@ -246,6 +246,7 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD;
     ByteBoolD opByteBoolD2(ByteBoolD byteBoolD);
     
     StringS opStringLiterals();
+    StringS opWStringLiterals();
 };
 
 struct MyStruct1
diff --git a/python/test/Ice/operations/TestI.py b/python/test/Ice/operations/TestI.py
index 6700fbfa26e..449afb523fe 100644
--- a/python/test/Ice/operations/TestI.py
+++ b/python/test/Ice/operations/TestI.py
@@ -367,5 +367,8 @@ class MyDerivedClassI(Test.MyDerivedClass):
                 Test.sw0, Test.sw1, Test.sw2, Test.sw3, Test.sw4, Test.sw5, Test.sw6, Test.sw7, Test.sw8, Test.sw9, Test.sw10,
                 Test.ss0, Test.ss1, Test.ss2, Test.ss3, Test.ss4, Test.ss5,
                 Test.su0, Test.su1, Test.su2]
+    
+    def opWStringLiterals(self, current=None):
+        return self.opStringLiterals(current)
 
     
\ No newline at end of file