Xpetra: error: ISO C++ forbids nested type 'TpetraVector' with same name as enclosing class [-fpermissive]

Created by: Mark-E-Hamilton

I pulled in the most recent of Trilinos master for a Sierra integration build with ETI off. While building this file

/scratch/sierra/sierra_master/TPLs_src/Trilinos/packages/xpetra/sup/Matrix/Xpetra_MatrixFactory.cpp

It generated the following error:

In file included from /scratch/sierra/sierra_master/TPLs_src/Trilinos/packages/xpetra/src/Headers/Xpetra_UseShortNames.hpp:49:0,
                 from /scratch/sierra/sierra_master/TPLs_src/Trilinos/packages/xpetra/src/Vector/Xpetra_TpetraVector_def.hpp:335,
                 from /scratch/sierra/sierra_master/objs/tpls/Trilinos/b2ed81b8c8472240/packages/xpetra/src/Xpetra_TpetraVector.hpp:2,
                 from /scratch/sierra/sierra_master/TPLs_src/Trilinos/packages/xpetra/src/MultiVector/Xpetra_TpetraMultiVector_def.hpp:1028,
                 from /scratch/sierra/sierra_master/objs/tpls/Trilinos/b2ed81b8c8472240/packages/xpetra/src/Xpetra_TpetraMultiVector.hpp:2,
                 from /scratch/sierra/sierra_master/TPLs_src/Trilinos/packages/xpetra/src/CrsMatrix/Xpetra_TpetraCrsMatrix_decl.hpp:62,
                 from /scratch/sierra/sierra_master/objs/tpls/Trilinos/b2ed81b8c8472240/packages/xpetra/src/Xpetra_TpetraCrsMatrix.hpp:1,
                 from /scratch/sierra/sierra_master/TPLs_src/Trilinos/packages/xpetra/src/CrsMatrix/Xpetra_CrsMatrixFactory.hpp:54,
                 from /scratch/sierra/sierra_master/TPLs_src/Trilinos/packages/xpetra/sup/Matrix/Xpetra_Matrix.hpp:60,
                 from /scratch/sierra/sierra_master/TPLs_src/Trilinos/packages/xpetra/sup/Matrix/Xpetra_MatrixFactory.hpp:54,
                 from /scratch/sierra/sierra_master/TPLs_src/Trilinos/packages/xpetra/sup/Matrix/Xpetra_MatrixFactory.cpp:50:
/scratch/sierra/sierra_master/TPLs_src/Trilinos/packages/xpetra/src/Headers/Xpetra_UseShortNamesScalar.hpp:164:73: error: ISO C++ forbids nested type 'TpetraVector' with same name as enclosing class [-fpermissive]
 typedef Xpetra::TpetraVector<Scalar, LocalOrdinal, GlobalOrdinal, Node> TpetraVector;
                                                                         ^~~~~~~~~~~~
/scratch/sierra/sierra_master/TPLs_src/Trilinos/packages/xpetra/src/Headers/Xpetra_UseShortNamesScalar.hpp:164:73: error: 'Xpetra::TpetraVector<Scalar, int, long long int, Kokkos::Compat::KokkosDeviceWrapperNode<Kokkos::Serial> >::TpetraVector' has the same name as the class in which it is declared