OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1665 Fix Linux build errors

Browse Source
This commit is contained in:
Bjørnar Grip Fjær 2017-07-28 12:03:16 +02:00
parent 14627fae53
commit f23f7b0f7d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/CommandFileInterface/Core/RicfFieldCapability.h
View File

@ -130,8 +130,8 @@ struct RicfFieldReader< std::vector<T> >
errorMessageContainer->skipWhiteSpaceWithLineNumberCount(inputStream);
}
typename T value;
RicfFieldReader<typename T>::readFieldData(value, inputStream, errorMessageContainer);
T value;
RicfFieldReader<T>::readFieldData(value, inputStream, errorMessageContainer);
fieldValue.push_back(value);
}
}
@ -146,12 +146,12 @@ struct RicfFieldReader< std::vector<T> >
template <typename T>
struct RicfFieldWriter< std::vector<T> >
{
static void writeFieldData(const std::vector<T>& fieldValue, QTextStream& outputStream)
static void writeFieldData(const std::vector<T>& fieldValue, QTextStream& outputStream)
{
outputStream << "[";
for (size_t i = 0; i < fieldValue.size(); ++i)
{
RicfFieldWriter<typename T>::writeFieldData(fieldValue[i], outputStream);
RicfFieldWriter<T>::writeFieldData(fieldValue[i], outputStream);
if (i < fieldValue.size() - 1)
{
outputStream << ", ";

4
ApplicationCode/UnitTests/RifcCommandCore-Test.cpp
View File

@ -121,7 +121,7 @@ TEST(RicfCommands, ErrorMessages)
for (const auto& msg: errors.m_messages)
{
QString label;
if (msg.first == RicfMessages::ERROR)
if (msg.first == RicfMessages::MESSAGE_ERROR)
{
label = "Error : ";
}
@ -136,4 +136,4 @@ TEST(RicfCommands, ErrorMessages)
{
delete(obj);
}
}
}