aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2021-03-31 00:55:30 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-31 00:55:30 +0000
commit80db734614f4593cd5cada5158c31cad5cfb5c43 (patch)
treeb759c77cbd80c075943070072ecca105696b2a18
parent9103631e46f24bd30e8b2165a6c2ad575357759b (diff)
parent8da82d4b884bd582c8ecad00a58d2d7913d24926 (diff)
downloadeigen-80db734614f4593cd5cada5158c31cad5cfb5c43.tar.gz
Merge "Include <sstream> explicitly, and don't rely on the implicit include via <complex>." am: 46241a925a am: 1128de5640 am: dd54fa0cb1 am: 8da82d4b88android-mainline-12.0.0_r5android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19
Original change: https://android-review.googlesource.com/c/platform/external/eigen/+/1657199 Change-Id: Ifb4fd68b256d7ded7aa4bf20dbe3564187ba01d1
-rw-r--r--Eigen/Core1
-rw-r--r--Eigen/src/Core/arch/CUDA/Half.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/Eigen/Core b/Eigen/Core
index 0f7fa630d..ac7e39418 100644
--- a/Eigen/Core
+++ b/Eigen/Core
@@ -260,6 +260,7 @@
#include <cmath>
#include <cassert>
#include <functional>
+#include <sstream>
#include <iosfwd>
#include <cstring>
#include <string>
diff --git a/Eigen/src/Core/arch/CUDA/Half.h b/Eigen/src/Core/arch/CUDA/Half.h
index 294c517ea..88dd385a5 100644
--- a/Eigen/src/Core/arch/CUDA/Half.h
+++ b/Eigen/src/Core/arch/CUDA/Half.h
@@ -42,6 +42,7 @@
#define EIGEN_EXPLICIT_CAST(tgt_type) operator tgt_type()
#endif
+#include <sstream>
namespace Eigen {