[Libreoffice-commits] core.git: bridges/source

[Tor Lillqvist]

 bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx  |    7 ++++++-
 bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx  |    9 +++++++++
 bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx |    4 ++++
 3 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit d52bfc915f6513256b64aa0ed088783150a041c3
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Nov 12 00:00:35 2013 +0200

    Add some more comments
    
    Change-Id: I267cb424deee4d329a0860cf9c87f295fb8fc5bf

diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx
index 301efd1..6abdad9 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx
@@ -19,7 +19,7 @@
 
 #if defined(__arm) || defined(__arm64)
 
-// For iOS devices (ARM). Basically a copy of n
+// For iOS devices (ARM). Basically a copy of
 // ../gcc3_linux_arm/cpp2uno.cxx with some cleanups and necessary
 // changes: No dynamic code generation as that is prohibited for apps
 // in the App Store. Instead we use a set of pre-generated snippets.
@@ -29,6 +29,11 @@
 // sad. But then the whole bridges/source/cpp_uno is full of
 // copy/paste. So I continue in that tradition...
 
+// Note that for iOS, neither __ARM_EABI__ or __ARM_PCS_VFP are
+// defined.  The ifdefs for those have been left in place to keep this
+// file as close to ../gcc3_linux_arm/cpp2uno.cxx as possible, to make
+// future unification easier.
+
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
index c9d917a..8467772 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
@@ -19,6 +19,15 @@
 
 #if defined(__arm) || defined(__arm64)
 
+// For iOS devices (ARM). Basically a copy of
+// ../gcc3_linux_arm/cpp2uno.cxx with some cleanups and necessary
+// changes.
+
+// Note that for iOS, none of __ARM_EABI__, __ARM_ARCH_4T__ or
+// __ARM_PCS_VFP are defined.  The ifdefs for those have been left in
+// place to keep this file as close to ../gcc3_linux_arm/uno2cpp.cxx
+// as possible, to make future unification easier.
+
 #include <com/sun/star/uno/RuntimeException.hpp>
 
 #include "bridges/cpp_uno/shared/bridge.hxx"
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx
index 65f32e7..27cc9d8 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx
@@ -19,6 +19,10 @@
 
 #ifdef __i386
 
+// For the iOS emulator (i386). Basically a copy of
+// ../gcc3_macosx_intel/uno2cpp.cxx with some cleanups and necessary
+// changes.
+
 #include <com/sun/star/uno/RuntimeException.hpp>
 
 #include "bridges/cpp_uno/shared/bridge.hxx"