On Mon, 21 Dec 2020, Nathan Sidwell wrote:
> Yes, this is good.  I already managed to commit some of this with 
> the 98412 patch.

I wasn't sure, but seeing that you had not applied this, I figured
this was approval and pushed the remaining portion this afternoon,
per the below.

Gerald

PS: I am really starting to like our use of git.


commit 7e63d383b89cd75b7775883d71ed09724b9ee73f
Author: Gerald Pfeifer <ger...@pfeifer.com>
Date:   Tue Dec 22 13:37:56 2020 +0100

    c++: Fix build with clang
    
    After the addition of libcody building with clang 10.0.1 would fail
    as follows:
    
      In file included from .../libcody/cody.hh:24:
      In file included from /usr/include/c++/v1/memory:653:
      /usr/include/c++/v1/typeinfo:346:5: error: no member named 'fancy_abort'
      in namespace 'std::__1'; did you mean simply 'fancy_abort'?
        _VSTD::abort();
        ^~~~~~~
    
    mapper-client.cc and mapper-resolver.cc have addressed this already
    by getting <string> and <vector> included; do the same for module.cc.
    
    gcc/cp:
    2020-12-22  Gerald Pfeifer  <ger...@pfeifer.com>
    
            * module.cc (INCLUDE_STRING): Define.
            (INCLUDE_VECTOR): Ditto.

diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc
index 7e38293545f..ed3dbe244a3 100644
--- a/gcc/cp/module.cc
+++ b/gcc/cp/module.cc
@@ -207,6 +207,8 @@ Classes used:
 
 #define _DEFAULT_SOURCE 1 /* To get TZ field of struct tm, if available.  */
 #include "config.h"
+#define INCLUDE_STRING
+#define INCLUDE_VECTOR
 #include "system.h"
 #include "coretypes.h"
 #include "cp-tree.h"

Reply via email to