diff options
| author | Bernd Schmidt <bernds@codesourcery.com> | 2014-11-18 12:13:26 +0000 |
|---|---|---|
| committer | Bernd Schmidt <bernds@gcc.gnu.org> | 2014-11-18 12:13:26 +0000 |
| commit | 3a4d1cb198375b66b6aa9f2b5c1659326d0d215d (patch) | |
| tree | c1dc3a713130e5950606aa1e1dbde40b5bfbfd6c | |
| parent | a6965b6517bc3fd60b5a3e1ad9accb0692376406 (diff) | |
| download | gcc-3a4d1cb198375b66b6aa9f2b5c1659326d0d215d.zip gcc-3a4d1cb198375b66b6aa9f2b5c1659326d0d215d.tar.gz gcc-3a4d1cb198375b66b6aa9f2b5c1659326d0d215d.tar.bz2 | |
Fix header conflicts in nvptx.
* config/nvptx/nvptx.c: Include <sstream> directly after "config.h".
From-SVN: r217710
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/config/nvptx/nvptx.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1dc082d..2bce0f1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2014-11-18 Bernd Schmidt <bernds@codesourcery.com> + + * config/nvptx/nvptx.c: Include <sstream> directly after "config.h". + 2014-11-18 Christophe Lyon <christophe.lyon@linaro.org> * config/arm/neon-testgen.ml (emit_prologue): Handle new diff --git a/gcc/config/nvptx/nvptx.c b/gcc/config/nvptx/nvptx.c index 9382812..c1fd271 100644 --- a/gcc/config/nvptx/nvptx.c +++ b/gcc/config/nvptx/nvptx.c @@ -19,6 +19,7 @@ <http://www.gnu.org/licenses/>. */ #include "config.h" +#include <sstream> #include "system.h" #include "coretypes.h" #include "tm.h" @@ -51,7 +52,6 @@ #include "df.h" #include "builtins.h" #include "hashtab.h" -#include <sstream> /* Record the function decls we've written, and the libfuncs and function decls corresponding to them. */ |