Typo and whitespace fixes by Kunda

[tools/medcoupling.git] / src / MEDCoupling / MEDCouplingNatureOfField.hxx

diff --git a/src/MEDCoupling/MEDCouplingNatureOfField.hxx b/src/MEDCoupling/MEDCouplingNatureOfField.hxx
index 00a9b02d45d0f71c2782c6dcdf7f656e04d5e9b4..811bc4041ae02de9632ea6bb5b0034d277c1264d 100644 (file)
--- a/src/MEDCoupling/MEDCouplingNatureOfField.hxx
+++ b/src/MEDCoupling/MEDCouplingNatureOfField.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,23 +22,18 @@
 #define __PARAMEDMEM_MEDCOUPLINGNATUREOFFIELD_HXX__
 
 #include "MEDCoupling.hxx"
+#include "MEDCouplingNatureOfFieldEnum"
+
 #include "InterpKernelException.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
-  typedef enum
-    {
-      NoNature               = 17,
-      ConservativeVolumic    = 26,
-      Integral               = 32,
-      IntegralGlobConstraint = 35,
-      RevIntegral            = 37
-    } NatureOfField;
-
   class MEDCouplingNatureOfField
   {
   public:
-    MEDCOUPLING_EXPORT static const char *GetRepr(NatureOfField nat) throw(INTERP_KERNEL::Exception);
+    MEDCOUPLING_EXPORT static const char *GetRepr(NatureOfField nat);
+    MEDCOUPLING_EXPORT static std::string GetReprNoThrow(NatureOfField nat);
+    MEDCOUPLING_EXPORT static std::string GetAllPossibilitiesStr();
   private:
     static const int NB_OF_POSSIBILITIES=5;
     static const char *REPR_OF_NATUREOFFIELD[NB_OF_POSSIBILITIES];