SHARE
TWEET

Untitled

a guest Oct 21st, 2019 45 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. --- bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx.orig 2019-08-29 21:51:57 UTC
  2. +++ bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
  3. @@ -234,7 +234,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping *
  4.  
  5.  void fillUnoException(uno_Any * pExc, uno_Mapping * pCpp2Uno)
  6.  {
  7. -    __cxa_exception * header = __cxa_get_globals()->caughtExceptions;
  8. +    __cxxabiv1::__cxa_exception * header = __cxa_get_globals()->caughtExceptions;
  9.      if (! header)
  10.          terminate();
  11.  
  12. --- bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx.orig  2019-09-18 14:12:06 UTC
  13. +++ bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx
  14. @@ -25,6 +25,32 @@
  15.  #include <exception>
  16.  #include <cstddef>
  17.  
  18. +namespace __cxxabiv1 {
  19. +class __class_type_info: public std::type_info {
  20. +public:
  21. +    explicit __class_type_info(char const * n): type_info(n) {}
  22. +    ~__class_type_info() override;
  23. +};
  24. +}
  25. +
  26. +namespace __cxxabiv1 {
  27. +class __si_class_type_info: public __class_type_info {
  28. +public:
  29. +    __class_type_info const * __base_type;
  30. +    explicit __si_class_type_info(
  31. +        char const * n, __class_type_info const *base):
  32. +        __class_type_info(n), __base_type(base) {}
  33. +    ~__si_class_type_info() override;
  34. +};
  35. +}
  36. +
  37. +namespace __cxxabiv1 {
  38. +extern "C" __cxa_eh_globals *__cxa_get_globals() throw();
  39. +}
  40. +namespace __cxxabiv1 {
  41. +extern "C" std::type_info *__cxa_current_exception_type() throw();
  42. +}
  43. +
  44.  namespace CPPU_CURRENT_NAMESPACE
  45.  {
  46.  
  47. @@ -72,9 +98,6 @@ struct __cxa_eh_globals
  48.      __cxa_exception *caughtExceptions;
  49.      unsigned int uncaughtExceptions;
  50.  };
  51. -
  52. -extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
  53. -extern "C" std::type_info *__cxa_current_exception_type() throw();
  54.  
  55.  void raiseException(
  56.      uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!
 
Top