diff options
| author | Dan Albert <danalbert@google.com> | 2021-03-31 00:20:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-31 00:20:17 +0000 |
| commit | 8da82d4b884bd582c8ecad00a58d2d7913d24926 (patch) | |
| tree | b759c77cbd80c075943070072ecca105696b2a18 | |
| parent | 0c2dcb90e1849c1e86797f73c40b77af4dc5bf29 (diff) | |
| parent | dd54fa0cb1ed72e02cbebaaae6513a2151526b85 (diff) | |
| download | eigen-android12L-dev.tar.gz | |
Merge "Include <sstream> explicitly, and don't rely on the implicit include via <complex>." am: 46241a925a am: 1128de5640 am: dd54fa0cb1android-vts-12.1_r2android-cts-12.1_r2android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Original change: https://android-review.googlesource.com/c/platform/external/eigen/+/1657199
Change-Id: I6017b13713c78ea629978a0de22c33d6c2393b17
| -rw-r--r-- | Eigen/Core | 1 | ||||
| -rw-r--r-- | Eigen/src/Core/arch/CUDA/Half.h | 1 |
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 { |