Skip to content

Commit 9c6d295

Browse files
committed
i hate you windows
1 parent 1dd5c80 commit 9c6d295

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

Framework/Nexus/inc/MantidNexus/NeXusFile.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ class MANTID_NEXUS_DLL File {
410410
*
411411
* \param data The pointer to copy the data to.
412412
*/
413-
template <typename NumT> void getData(NumT *const data);
413+
template <typename NumT> void getData(NumT *data);
414414

415415
/**
416416
* Put data into the supplied vector. The vector does not need to

Framework/Nexus/inc/MantidNexus/NexusClasses.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ class MANTID_NEXUS_DLL NXDataSet : public NXObject {
165165
*/
166166
template <typename NumT> void getData(NumT *data) {
167167
m_fileID->openData(name());
168-
m_fileID->getData<NumT>(data);
168+
m_fileID->getData(data);
169169
m_fileID->closeData();
170170
}
171171

Framework/Nexus/src/NeXusFile.cpp

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -977,31 +977,31 @@ template MANTID_NEXUS_DLL void File::putData(const vector<float> &data);
977977
template MANTID_NEXUS_DLL void File::putData(const vector<double> &data);
978978
template MANTID_NEXUS_DLL void File::putData(const vector<char> &data);
979979

980-
template MANTID_NEXUS_DLL void File::putData(const float *const data);
981-
template MANTID_NEXUS_DLL void File::putData(const double *const data);
982-
template MANTID_NEXUS_DLL void File::putData(const int8_t *const data);
983-
template MANTID_NEXUS_DLL void File::putData(const uint8_t *const data);
984-
template MANTID_NEXUS_DLL void File::putData(const int16_t *const data);
985-
template MANTID_NEXUS_DLL void File::putData(const uint16_t *const data);
986-
template MANTID_NEXUS_DLL void File::putData(const int32_t *const data);
987-
template MANTID_NEXUS_DLL void File::putData(const uint32_t *const data);
988-
template MANTID_NEXUS_DLL void File::putData(const int64_t *const data);
989-
template MANTID_NEXUS_DLL void File::putData(const uint64_t *const data);
990-
template MANTID_NEXUS_DLL void File::putData(const char *const data);
991-
template MANTID_NEXUS_DLL void File::putData(const bool *const data);
992-
993-
template MANTID_NEXUS_DLL void File::getData(float *const data);
994-
template MANTID_NEXUS_DLL void File::getData(double *const data);
995-
template MANTID_NEXUS_DLL void File::getData(int8_t *const data);
996-
template MANTID_NEXUS_DLL void File::getData(uint8_t *const data);
997-
template MANTID_NEXUS_DLL void File::getData(int16_t *const data);
998-
template MANTID_NEXUS_DLL void File::getData(uint16_t *const data);
999-
template MANTID_NEXUS_DLL void File::getData(int32_t *const data);
1000-
template MANTID_NEXUS_DLL void File::getData(uint32_t *const data);
1001-
template MANTID_NEXUS_DLL void File::getData(int64_t *const data);
1002-
template MANTID_NEXUS_DLL void File::getData(uint64_t *const data);
1003-
template MANTID_NEXUS_DLL void File::getData(char *const data);
1004-
template MANTID_NEXUS_DLL void File::getData(bool *const data);
980+
template MANTID_NEXUS_DLL void File::putData(const float *data);
981+
template MANTID_NEXUS_DLL void File::putData(const double *data);
982+
template MANTID_NEXUS_DLL void File::putData(const int8_t *data);
983+
template MANTID_NEXUS_DLL void File::putData(const uint8_t *data);
984+
template MANTID_NEXUS_DLL void File::putData(const int16_t *data);
985+
template MANTID_NEXUS_DLL void File::putData(const uint16_t *data);
986+
template MANTID_NEXUS_DLL void File::putData(const int32_t *data);
987+
template MANTID_NEXUS_DLL void File::putData(const uint32_t *data);
988+
template MANTID_NEXUS_DLL void File::putData(const int64_t *data);
989+
template MANTID_NEXUS_DLL void File::putData(const uint64_t *data);
990+
template MANTID_NEXUS_DLL void File::putData(const char *data);
991+
template MANTID_NEXUS_DLL void File::putData(const bool *data);
992+
993+
template MANTID_NEXUS_DLL void File::getData(float *data);
994+
template MANTID_NEXUS_DLL void File::getData(double *data);
995+
template MANTID_NEXUS_DLL void File::getData(int8_t *data);
996+
template MANTID_NEXUS_DLL void File::getData(uint8_t *data);
997+
template MANTID_NEXUS_DLL void File::getData(int16_t *data);
998+
template MANTID_NEXUS_DLL void File::getData(uint16_t *data);
999+
template MANTID_NEXUS_DLL void File::getData(int32_t *data);
1000+
template MANTID_NEXUS_DLL void File::getData(uint32_t *data);
1001+
template MANTID_NEXUS_DLL void File::getData(int64_t *data);
1002+
template MANTID_NEXUS_DLL void File::getData(uint64_t *data);
1003+
template MANTID_NEXUS_DLL void File::getData(char *data);
1004+
template MANTID_NEXUS_DLL void File::getData(bool *data);
10051005

10061006
template MANTID_NEXUS_DLL void File::getData(vector<float> &data);
10071007
template MANTID_NEXUS_DLL void File::getData(vector<double> &data);

0 commit comments

Comments
 (0)