iOS, update to original files

Update to old files (from Tor in 2013) to prepare for generate.

Change-Id: I832a242b7b91179e9c269fa9e48a1698aa2f2a66

3 files changed, 16 insertions, 3 deletions

diff --git a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
index 762dbdc8db76..0ca1401ba960 100644
--- a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
@@ -17,6 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#ifdef __arm64
+
+// For iOS devices (64-bit ARM). Originally a copy of
+// ../gcc3_linux_arm/cpp2uno.cxx.
+
+// No attempts at factoring out the large amounts of more or less
+// common code in this, cpp2uno-arm.cxx and cpp2uno-i386.cxx have been
+// done. Which is sad. But then the whole bridges/source/cpp_uno is
+// full of copy/paste. So I continue in that tradition...
+
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <sal/log.hxx>
 #include <uno/data.h>
@@ -29,7 +39,6 @@
 
 #include "share.hxx"
 
-#ifdef __arm64
 extern "C" {
     extern int nFunIndexes, nVtableOffsets;
     extern int codeSnippets[];
@@ -290,6 +299,7 @@ namespace
         }
     }
 
+
     static typelib_TypeClass cpp_mediate( sal_Int32 nFunctionIndex,
                                           sal_Int32 nVtableOffset,
                                           void ** pCallStack,
@@ -544,6 +554,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
     }
     return code;
 }
+
 #endif
 
 
@@ -553,4 +564,5 @@ void bridges::cpp_uno::shared::VtableFactory::flushCode(
     // No dynamic code generation so nothing to flush
 }
 
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_ios/except.cxx b/bridges/source/cpp_uno/gcc3_ios/except.cxx
index 17b95473f92c..1d1eeccd97ae 100644
--- a/bridges/source/cpp_uno/gcc3_ios/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios/except.cxx
@@ -143,7 +143,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_map< OUString, std::type_info * > t_rtti_map;
+    typedef std::unordered_map< OUString, std::type_info *, OUStringHash > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_ios/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_ios/uno2cpp.cxx
index 6d2c82fbe0d4..7915fa7a9513 100644
--- a/bridges/source/cpp_uno/gcc3_ios/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios/uno2cpp.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#ifdef __arm64
+
 #include <com/sun/star/uno/RuntimeException.hpp>
 
 #include "bridge.hxx"
@@ -28,7 +30,6 @@
 
 using namespace ::com::sun::star::uno;
 
-#ifdef __arm64
 namespace arm
 {
     bool is_hfa_struct(const typelib_TypeDescription * type)