#1755 Use namespace instead of class to encapsulate structures

This commit is contained in:
Magne Sjaastad committed 2017-08-11 14:28:43 +02:00
1 parent 89684c243f
commit 839e3e1d00
3 files changed
+12 -7

No files matched your search

+2 -1
View File
@@ -19,6 +19,7 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RiaDefines.h"
#include "cafAppEnum.h"
@@ -306,5 +307,5 @@ double RiaDefines::minimumDefaultValuePlot()
//--------------------------------------------------------------------------------------------------
double RiaDefines::maximumDefaultValuePlot()
{
return 100.0;
return 100.0;
}
@@ -21,11 +21,14 @@
#include "cafAppEnum.h"
template<>
void caf::AppEnum< RiaDefines::PorosityModelType >::setUp()
namespace caf
{
addItem(RiaDefines::MATRIX_MODEL, "MATRIX_MODEL", "Matrix");
addItem(RiaDefines::FRACTURE_MODEL, "FRACTURE_MODEL", "Fracture");
template<>
void caf::AppEnum< RiaDefines::PorosityModelType >::setUp()
{
addItem(RiaDefines::MATRIX_MODEL, "MATRIX_MODEL", "Matrix");
addItem(RiaDefines::FRACTURE_MODEL, "FRACTURE_MODEL", "Fracture");
setDefault(RiaDefines::MATRIX_MODEL);
setDefault(RiaDefines::MATRIX_MODEL);
}
}
@@ -21,7 +21,8 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
namespace RiaDefines {
namespace RiaDefines
{
enum PorosityModelType
{
MATRIX_MODEL,