diff options
| author | Ian Lance Taylor <iant@golang.org> | 2021-09-13 10:37:49 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2021-09-13 10:37:49 -0700 |
| commit | e252b51ccde010cbd2a146485d8045103cd99533 (patch) | |
| tree | e060f101cdc32bf5e520de8e5275db9d4236b74c /c++tools/resolver.h | |
| parent | f10c7c4596dda99d2ee872c995ae4aeda65adbdf (diff) | |
| parent | 104c05c5284b7822d770ee51a7d91946c7e56d50 (diff) | |
| download | gcc-e252b51ccde010cbd2a146485d8045103cd99533.zip gcc-e252b51ccde010cbd2a146485d8045103cd99533.tar.gz gcc-e252b51ccde010cbd2a146485d8045103cd99533.tar.bz2 | |
Merge from trunk revision 104c05c5284b7822d770ee51a7d91946c7e56d50.
Diffstat (limited to 'c++tools/resolver.h')
| -rw-r--r-- | c++tools/resolver.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/c++tools/resolver.h b/c++tools/resolver.h index 1933912..b2f4381 100644 --- a/c++tools/resolver.h +++ b/c++tools/resolver.h @@ -1,5 +1,5 @@ /* C++ modules. Experimental! -*- c++ -*- - Copyright (C) 2017-2020 Free Software Foundation, Inc. + Copyright (C) 2017-2021 Free Software Foundation, Inc. Written by Nathan Sidwell <nathan@acm.org> while at FaceBook This file is part of GCC. @@ -24,8 +24,10 @@ along with GCC; see the file COPYING3. If not see // Mapper interface for client and server bits #include "cody.hh" // C++ +#if !IN_GCC #include <string> #include <map> +#endif // This is a GCC class, so GCC coding conventions on new bits. class module_resolver : public Cody::Resolver |