Attachment 864614 Details for Bug 1066546 – Fix for noexcept problem

[patch] Fix for noexcept problem

gearbox-hokuyo-noexcept.patch (text/plain), 4.26 KB, created by Tim Niemueller on 2014-02-18 15:38:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Niemueller

Created: 2014-02-18 15:38:04 UTC

Size: 4.26 KB

patch

obsolete

>--- hokuyo_errors.h	2014-02-18 16:32:39.173216241 +0100
>+++ /usr/include/hokuyoaist-3/hokuyoaist/hokuyo_errors.h	2014-02-18 16:31:07.525811475 +0100
>@@ -80,7 +80,13 @@
>         virtual char const* error_type() const throw()
>             { return error_type_; }
> 
>+#if __GLIBCXX__
>+        virtual const char* what() const _GLIBCXX_USE_NOEXCEPT;
>+#elif _LIBCPP_VERSION
>+        virtual const char* what() noexcept;
>+#else
>         virtual const char* what() throw();
>+#endif
> 
>     protected:
>         /** Description code for use with the error string table. */
>@@ -170,7 +176,13 @@
>         unsigned int baud() const throw()
>             { return baud_; }
> 
>+#if __GLIBCXX__
>+        virtual const char* what() const _GLIBCXX_USE_NOEXCEPT;
>+#elif _LIBCPP_VERSION
>+        virtual const char* what() noexcept;
>+#else
>         const char* what() throw();
>+#endif
> 
>     protected:
>         /** Baud rate that caused the error. */
>@@ -368,7 +380,13 @@
>         virtual int calculated() const throw()
>             { return calculated_; }
> 
>+#if __GLIBCXX__
>+        virtual const char* what() const _GLIBCXX_USE_NOEXCEPT;
>+#elif _LIBCPP_VERSION
>+        virtual const char* what() noexcept;
>+#else
>         const char* what() throw();
>+#endif
> 
>     protected:
>         /** Expected checksum value. */
>@@ -411,7 +429,13 @@
>         virtual char const* const line() const throw()
>             { return line_; }
> 
>+#if __GLIBCXX__
>+        virtual const char* what() const _GLIBCXX_USE_NOEXCEPT;
>+#elif _LIBCPP_VERSION
>+        virtual const char* what() noexcept;
>+#else
>         const char* what() throw();
>+#endif
> 
>     protected:
>         /** The mystery line. */
>@@ -436,7 +460,13 @@
>         virtual char const* const type() const throw()
>             { return type_; }
> 
>+#if __GLIBCXX__
>+        virtual const char* what() const _GLIBCXX_USE_NOEXCEPT;
>+#elif _LIBCPP_VERSION
>+        virtual const char* what() noexcept;
>+#else
>         const char* what() throw();
>+#endif
> 
>     protected:
>         /** The bad line. */
>@@ -487,7 +517,13 @@
>         virtual char const* const cmd_code() const throw()
>             { return cmd_; }
> 
>+#if __GLIBCXX__
>+        virtual const char* what() const _GLIBCXX_USE_NOEXCEPT;
>+#elif _LIBCPP_VERSION
>+        virtual const char* what() noexcept;
>+#else
>         const char* what() throw();
>+#endif
> 
>     protected:
>         /** Error code as defined in SCIP2 (two bytes). */
>@@ -522,7 +558,13 @@
>         virtual char cmd_code() const throw()
>             { return cmd_; }
> 
>+#if __GLIBCXX__
>+        virtual const char* what() const _GLIBCXX_USE_NOEXCEPT;
>+#elif _LIBCPP_VERSION
>+        virtual const char* what() noexcept;
>+#else
>         const char* what() throw();
>+#endif
> 
>     protected:
>         /** Error code as defined in SCIP2 (two bytes). */
>@@ -563,7 +605,13 @@
>         virtual char const* const cmd_echo() const throw()
>             { return echo_; }
> 
>+#if __GLIBCXX__
>+        virtual const char* what() const _GLIBCXX_USE_NOEXCEPT;
>+#elif _LIBCPP_VERSION
>+        virtual const char* what() noexcept;
>+#else
>         const char* what() throw();
>+#endif
> 
>     protected:
>         /** Command that triggered the error, from SCIP2 (two bytes). */
>@@ -596,7 +644,13 @@
>         virtual char const* const cmd_code() const throw()
>             { return cmd_; }
> 
>+#if __GLIBCXX__
>+        virtual const char* what() const _GLIBCXX_USE_NOEXCEPT;
>+#elif _LIBCPP_VERSION
>+        virtual const char* what() noexcept;
>+#else
>         const char* what() throw();
>+#endif
> 
>     protected:
>         /** Command that triggered the error, from SCIP2 (two bytes). */
>@@ -627,7 +681,13 @@
>         virtual int line_length() const throw()
>             { return line_length_; }
> 
>+#if __GLIBCXX__
>+        virtual const char* what() const _GLIBCXX_USE_NOEXCEPT;
>+#elif _LIBCPP_VERSION
>+        virtual const char* what() noexcept;
>+#else
>         const char* what() throw();
>+#endif
> 
>     protected:
>         /** Number of bytes available. */
>@@ -660,7 +720,13 @@
>         virtual int expected() const throw()
>             { return expected_; }
> 
>+#if __GLIBCXX__
>+        virtual const char* what() const _GLIBCXX_USE_NOEXCEPT;
>+#elif _LIBCPP_VERSION
>+        virtual const char* what() noexcept;
>+#else
>         const char* what() throw();
>+#endif
> 
>     protected:
>         /** The received line length. */

Actions: View | Diff

Attachments on bug 1066546: 864614