Re: [openoffice] 02/02: i123947 - fix stlport emulation when compiling in C++11 mode

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

Re: [openoffice] 02/02: i123947 - fix stlport emulation when compiling in C++11 mode

Don Lewis-2
I've run into quite a few issues in C++11 mode.  On FreeBSD, I'm forcing
gnu++98 mode with modern compilers.  That matches the long time gcc
default.

On 27 Oct, [hidden email] wrote:

> This is an automated email from the ASF dual-hosted git repository.
>
> arielch pushed a commit to branch trunk
> in repository https://gitbox.apache.org/repos/asf/openoffice.git
>
> commit 1828d080320011efd486c973e80e3eec3ad241f7
> Author: Ariel Constenla-Haile <[hidden email]>
> AuthorDate: Sun Oct 27 03:51:33 2019 -0300
>
>     i123947 - fix stlport emulation when compiling in C++11 mode
> ---
>  main/stlport/systemstl/list    | 2 ++
>  main/stlport/systemstl/map     | 2 ++
>  main/stlport/systemstl/numeric | 2 ++
>  main/stlport/systemstl/set     | 2 ++
>  main/stlport/systemstl/vector  | 2 ++
>  5 files changed, 10 insertions(+)
>
> diff --git a/main/stlport/systemstl/list b/main/stlport/systemstl/list
> index 1fa1dc5..36f5d86 100644
> --- a/main/stlport/systemstl/list
> +++ b/main/stlport/systemstl/list
> @@ -32,6 +32,8 @@
>      #pragma warning(disable:4555)
>      #include <../../VC/include/list>
>      #pragma warning(pop)
> +#elif defined(__cplusplus) && (__cplusplus >= 201103L)
> +    #include_next <list>
>  #else // fall back to boost/tr1
>      #include <boost/tr1/tr1/list>
>  #endif
> diff --git a/main/stlport/systemstl/map b/main/stlport/systemstl/map
> index 13f783b..ec1c3db 100644
> --- a/main/stlport/systemstl/map
> +++ b/main/stlport/systemstl/map
> @@ -25,6 +25,8 @@
>  #ifdef HAVE_STL_INCLUDE_PATH
>   // TODO: use computed include file name
>   #include_next <map>
> +#elif defined(__cplusplus) && (__cplusplus >= 201103L)
> +    #include_next <map>
>  #elif defined(_MSC_VER)
>   #include <../../VC/include/map>
>  #else // fall back to boost/tr1
> diff --git a/main/stlport/systemstl/numeric b/main/stlport/systemstl/numeric
> index 975612b..5bd6b90 100644
> --- a/main/stlport/systemstl/numeric
> +++ b/main/stlport/systemstl/numeric
> @@ -25,6 +25,8 @@
>  #ifdef HAVE_STL_INCLUDE_PATH
>   // TODO: use computed include file name
>   #include_next <numeric>
> +#elif defined(__cplusplus) && (__cplusplus >= 201103L)
> +    #include_next <numeric>
>  #elif defined(_MSC_VER)
>   #include <../../VC/include/numeric>
>  #else // fall back to boost/tr1
> diff --git a/main/stlport/systemstl/set b/main/stlport/systemstl/set
> index 2d99053..674cab0 100644
> --- a/main/stlport/systemstl/set
> +++ b/main/stlport/systemstl/set
> @@ -27,6 +27,8 @@
>   // TODO: use computed include file name
>   #include "utility"
>   #include_next <set>
> +#elif defined(__cplusplus) && (__cplusplus >= 201103L)
> +    #include_next <set>
>  #elif defined(_MSC_VER)
>   #include <../../VC/include/set>
>  #else // fall back to boost/tr1
> diff --git a/main/stlport/systemstl/vector b/main/stlport/systemstl/vector
> index 8b4e86f..3275372 100644
> --- a/main/stlport/systemstl/vector
> +++ b/main/stlport/systemstl/vector
> @@ -25,6 +25,8 @@
>  #ifdef HAVE_STL_INCLUDE_PATH
>   // TODO: use computed include file name
>   #include_next <vector>
> +#elif defined(__cplusplus) && (__cplusplus >= 201103L)
> +    #include_next <vector>
>  #elif defined(_MSC_VER)
>   #include <../../VC/include/vector>
>  #else // fall back to boost/tr1
>


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]