[Libreoffice-commits] .: 2 commits - bridges/test xmlsecurity/source

[David Tardon]

 bridges/test/inter_libs_exc/inter.cxx            |    4 ++--
 xmlsecurity/source/xmlsec/nss/nssinitializer.cxx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9dec6475aa7057d8544d8f8a3c716c90fe7f9e65
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Jan 11 07:48:43 2012 +0100

    fix for gcc 4.7/C++11: these are not string literal operators

diff --git a/bridges/test/inter_libs_exc/inter.cxx b/bridges/test/inter_libs_exc/inter.cxx
index 1eb7bb8..fe4a246 100644
--- a/bridges/test/inter_libs_exc/inter.cxx
+++ b/bridges/test/inter_libs_exc/inter.cxx
@@ -46,10 +46,10 @@ extern "C" int main( int argc, char const * argv [] )
 #define SAL_DLLPREFIX ""
 #endif
     Module mod_starter(
-        OUSTR(SAL_DLLPREFIX"starter"SAL_DLLEXTENSION),
+        OUSTR(SAL_DLLPREFIX "starter" SAL_DLLEXTENSION),
         SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL );
     Module mod_thrower(
-        OUSTR(SAL_DLLPREFIX"thrower"SAL_DLLEXTENSION),
+        OUSTR(SAL_DLLPREFIX "thrower" SAL_DLLEXTENSION),
         SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL );
 
     typedef t_throws_exc (SAL_CALL * t_get_thrower)();
commit 0669fdb4874f8169ce1e49f3ae946c87ce1478ce
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Jan 11 07:47:38 2012 +0100

    fix for gcc 4.7/C++11: this is not string literal operator

diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index a1e5977..0e2553d 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -297,7 +297,7 @@ bool nsscrypto_initialize( const css::uno::Reference< css::lang::XMultiServiceFa
         deleteRootsModule();
 
 #if defined SYSTEM_MOZILLA
-        OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("libnssckbi"SAL_DLLEXTENSION));
+        OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("libnssckbi" SAL_DLLEXTENSION));
 #else
         OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("${LO_LIB_DIR}/libnssckbi" SAL_DLLEXTENSION));
 #endif