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

Fix build problem on Linux with missing cvfBase.h

Browse Source
This commit is contained in:
Gaute Lindkvist 2018-12-03 10:26:47 +01:00
parent 45e909fcfa
commit 9961b39473
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/Application/Tools/RiaBoundingBoxTools.h
View File

@ -20,6 +20,7 @@
#pragma once #pragma once
#include <cvfBase.h>
#include <cvfBoundingBox.h> #include <cvfBoundingBox.h>
//================================================================================================== //==================================================================================================

2
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@ -446,7 +446,7 @@ void RimProject::setProjectFileNameAndUpdateDependencies(const QString& projectF
QString oldProjectPath = fileInfoOld.path(); QString oldProjectPath = fileInfoOld.path();
std::vector<caf::FilePath*> filePaths; std::vector<caf::FilePath*> filePaths;
fieldsByType(this, filePaths); fieldContentsByType(this, filePaths);
for (caf::FilePath* filePath : filePaths) for (caf::FilePath* filePath : filePaths)
{ {

6
ApplicationCode/ProjectDataModel/RimProject.h
View File

@ -166,7 +166,7 @@ protected:
private: private:
template <typename T> template <typename T>
void fieldsByType(caf::PdmObjectHandle* object, std::vector<T*>& typedFields); void fieldContentsByType(caf::PdmObjectHandle* object, std::vector<T*>& typedFields);
private: private:
caf::PdmField<QString> m_projectFileVersionString; caf::PdmField<QString> m_projectFileVersionString;
@ -188,7 +188,7 @@ private:
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
template <typename T> template <typename T>
void RimProject::fieldsByType(caf::PdmObjectHandle* object, std::vector<T*>& typedFields) void RimProject::fieldContentsByType(caf::PdmObjectHandle* object, std::vector<T*>& typedFields)
{ {
if (!object) return; if (!object) return;
@ -216,6 +216,6 @@ void RimProject::fieldsByType(caf::PdmObjectHandle* object, std::vector<T*>& typ
for (const auto& child : children) for (const auto& child : children)
{ {
fieldsByType(child, typedFields); fieldContentsByType(child, typedFields);
} }
} }