From 839e3e1d00a89cdb51690136e6a5c4e3655c9f67 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Fri, 11 Aug 2017 14:24:34 +0200
Subject: [PATCH] #1755 Use namespace instead of class to encapsulate
 structures

---
 ApplicationCode/Application/RiaDefines.cpp       |  3 ++-
 ApplicationCode/Application/RiaPorosityModel.cpp | 13 ++++++++-----
 ApplicationCode/Application/RiaPorosityModel.h   |  3 ++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ApplicationCode/Application/RiaDefines.cpp b/ApplicationCode/Application/RiaDefines.cpp
index 11c40806ba..8fc8a61f86 100644
--- a/ApplicationCode/Application/RiaDefines.cpp
+++ b/ApplicationCode/Application/RiaDefines.cpp
@@ -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;
 }
diff --git a/ApplicationCode/Application/RiaPorosityModel.cpp b/ApplicationCode/Application/RiaPorosityModel.cpp
index 6b93a857bd..4ca08690ec 100644
--- a/ApplicationCode/Application/RiaPorosityModel.cpp
+++ b/ApplicationCode/Application/RiaPorosityModel.cpp
@@ -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);
+    }
 }
diff --git a/ApplicationCode/Application/RiaPorosityModel.h b/ApplicationCode/Application/RiaPorosityModel.h
index b6694cb930..1ad3a4a1c3 100644
--- a/ApplicationCode/Application/RiaPorosityModel.h
+++ b/ApplicationCode/Application/RiaPorosityModel.h
@@ -21,7 +21,8 @@
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-namespace RiaDefines {
+namespace RiaDefines
+{
     enum PorosityModelType
     {
         MATRIX_MODEL,