diff options
| author |  gracehoney <31743510+aaroey@users.noreply.github.com> | 2018-08-09 11:44:07 -0700 |
|---|---|---|
| committer | gracehoney <31743510+aaroey@users.noreply.github.com> | 2018-08-09 11:44:07 -0700 |
| commit | 728422d1eee62374b3221676a1826660473897bc (patch) | |
| tree | 161115f7ba7d544d86bd491da9a18ae2c4556c17 /third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/FixedPointTypes.h | |
| parent | 1d4a8296b26150f7eabf5bbb981b9b2438a9fb2a (diff) | |
| parent | fd9fc4b4b69f7fce60497bbaf5cbd958f12ead8d (diff) | |
Fix conflicts with upstream/master
Diffstat (limited to 'third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/FixedPointTypes.h')
| -rw-r--r-- | third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/FixedPointTypes.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/FixedPointTypes.h b/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/FixedPointTypes.h index 6b625abc3e..5ab3664918 100644 --- a/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/FixedPointTypes.h +++ b/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/FixedPointTypes.h @@ -7,8 +7,8 @@ // Public License v. 2.0. If a copy of the MPL was not distributed // with this file, You can obtain one at http://mozilla.org/MPL/2.0/. -#ifndef EIGEN_CXX11_FIXED_POINT_TYPES_H -#define EIGEN_CXX11_FIXED_POINT_TYPES_H +#ifndef CXX11_SRC_FIXEDPOINT_FIXEDPOINTTYPES_H_ +#define CXX11_SRC_FIXEDPOINT_FIXEDPOINTTYPES_H_ #include <cmath> #include <iostream> @@ -339,4 +339,4 @@ EIGEN_STRONG_INLINE std::ostream& operator<<(std::ostream& os, QInt32 a) { } // namespace Eigen -#endif // EIGEN_CXX11_FIXED_POINT_TYPES_H +#endif // CXX11_SRC_FIXEDPOINT_FIXEDPOINTTYPES_H_ |