Index: trunk/GnssCenter/monitor/const.h
===================================================================
--- trunk/GnssCenter/monitor/const.h	(revision 5449)
+++ trunk/GnssCenter/monitor/const.h	(revision 5450)
@@ -4,8 +4,7 @@
 namespace GnssCenter {
 
-enum t_irc {failure = -1, success, fatal}; // return code
-
 class t_CST {
  public:
+  enum t_irc {failure = -1, success, fatal}; // return code
   static const double aell;
   static const double fInv;
Index: trunk/GnssCenter/monitor/monitor.cpp
===================================================================
--- trunk/GnssCenter/monitor/monitor.cpp	(revision 5449)
+++ trunk/GnssCenter/monitor/monitor.cpp	(revision 5450)
@@ -140,5 +140,5 @@
       double ell[3];
 
-      if (xyz2ell(xyz, ell) == success) {
+      if (t_utils::xyz2ell(xyz, ell) == t_CST::success) {
         double latDeg = ell[0] * 180.0 / M_PI;
         double lonDeg = ell[1] * 180.0 / M_PI;
Index: trunk/GnssCenter/monitor/utils.cpp
===================================================================
--- trunk/GnssCenter/monitor/utils.cpp	(revision 5449)
+++ trunk/GnssCenter/monitor/utils.cpp	(revision 5450)
@@ -9,5 +9,5 @@
 // Rectangular Coordinates -> Ellipsoidal Coordinates
 ////////////////////////////////////////////////////////////////////////////
-t_irc xyz2ell(const double* XYZ, double* Ell) {
+t_CST::t_irc t_utils::xyz2ell(const double* XYZ, double* Ell) {
 
   const double bell = t_CST::aell*(1.0-1.0/t_CST::fInv) ;
@@ -37,14 +37,14 @@
     Ell[0] = atan(zps/(1.0-e2*nn/(nn+Ell[2]))) ;
     if ( fabs(phiOld-Ell[0]) <= 1.0e-11 && fabs(hOld-Ell[2]) <= 1.0e-5 ) {
-      return success;
+      return t_CST::success;
     }
   }
 
-  return failure;
+  return t_CST::failure;
 }
 
 // Rectangular Coordinates -> North, East, Up Components
 ////////////////////////////////////////////////////////////////////////////
-void xyz2neu(const double* Ell, const double* xyz, double* neu) {
+void t_utils::xyz2neu(const double* Ell, const double* xyz, double* neu) {
 
   double sinPhi = sin(Ell[0]);
@@ -67,5 +67,5 @@
 // North, East, Up Components -> Rectangular Coordinates
 ////////////////////////////////////////////////////////////////////////////
-void neu2xyz(const double* Ell, const double* neu, double* xyz) {
+void t_utils::neu2xyz(const double* Ell, const double* neu, double* xyz) {
 
   double sinPhi = sin(Ell[0]);
Index: trunk/GnssCenter/monitor/utils.h
===================================================================
--- trunk/GnssCenter/monitor/utils.h	(revision 5449)
+++ trunk/GnssCenter/monitor/utils.h	(revision 5450)
@@ -6,9 +6,12 @@
 namespace GnssCenter {
 
-t_irc xyz2ell(const double* XYZ, double* Ell);
+class t_utils {
+ public:
+  static t_CST::t_irc xyz2ell(const double* XYZ, double* Ell);
 
-void xyz2neu(const double* Ell, const double* xyz, double* neu);
+  static void xyz2neu(const double* Ell, const double* xyz, double* neu);
 
-void neu2xyz(const double* Ell, const double* neu, double* xyz);
+  static void neu2xyz(const double* Ell, const double* neu, double* xyz);
+};
 
 } // namespace GnssCenter