From 4e41c91022abc23fac75f01de9f3dbfa673e5b85 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Fri, 8 Feb 2013 21:50:40 +0100
Subject: [PATCH] feature #1483: Moved implementation of util functions to a cc
 file

---
 include/Util.h        | 32 ++++----------------------
 src/common/SConstruct |  3 ++-
 src/common/Util.cc    | 53 +++++++++++++++++++++++++++++++++++++++++++
 src/nebula/SConstruct |  2 +-
 4 files changed, 60 insertions(+), 30 deletions(-)
 create mode 100644 src/common/Util.cc

diff --git a/include/Util.h b/include/Util.h
index 336a01b9a0..be18222f1a 100644
--- a/include/Util.h
+++ b/include/Util.h
@@ -21,37 +21,13 @@
 
 namespace one_util
 {
-    inline string& toupper(string& st)
-    {
-        transform(st.begin(),st.end(),st.begin(),(int(*)(int))std::toupper);
-        return st;
-    };
+    std::string& toupper(std::string& st);
 
-    inline string& tolower(string& st)
-    {
-        transform(st.begin(),st.end(),st.begin(),(int(*)(int))std::tolower);
-        return st;
-    };
+    std::string& tolower(std::string& st);
 
-    inline string log_time(time_t the_time)
-    {
-        char time_str[26];
+    std::string log_time(time_t the_time);
 
-#ifdef SOLARIS
-        ctime_r(&(the_time),time_str,sizeof(char)*26);
-#else
-        ctime_r(&(the_time),time_str);
-#endif
-
-        time_str[24] = '\0'; // Get rid of final enter character
-
-        return string(time_str);
-    };
-
-    inline string log_time()
-    {
-        return log_time( time(0) );
-    };
+    std::string log_time();
 };
 
 #endif /* UTIL_H_ */
diff --git a/src/common/SConstruct b/src/common/SConstruct
index 3b24d2edac..5f3867988a 100644
--- a/src/common/SConstruct
+++ b/src/common/SConstruct
@@ -25,7 +25,8 @@ source_files=[
     'ActionManager.cc',
     'Attribute.cc',
     'mem_collector.c',
-    'SSLTools.cc'
+    'SSLTools.cc',
+    'Util.cc'
 ]
 
 # Build library
diff --git a/src/common/Util.cc b/src/common/Util.cc
new file mode 100644
index 0000000000..6a73eb4de5
--- /dev/null
+++ b/src/common/Util.cc
@@ -0,0 +1,53 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        */
+/*                                                                            */
+/* Licensed under the Apache License, Version 2.0 (the "License"); you may    */
+/* not use this file except in compliance with the License. You may obtain    */
+/* a copy of the License at                                                   */
+/*                                                                            */
+/* http://www.apache.org/licenses/LICENSE-2.0                                 */
+/*                                                                            */
+/* Unless required by applicable law or agreed to in writing, software        */
+/* distributed under the License is distributed on an "AS IS" BASIS,          */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   */
+/* See the License for the specific language governing permissions and        */
+/* limitations under the License.                                             */
+/* -------------------------------------------------------------------------- */
+
+#include "Util.h"
+#include <algorithm>
+
+using namespace std;
+
+string& one_util::toupper(string& st)
+{
+    transform(st.begin(),st.end(),st.begin(),(int(*)(int))toupper);
+    return st;
+};
+
+string& one_util::tolower(string& st)
+{
+    transform(st.begin(),st.end(),st.begin(),(int(*)(int))tolower);
+    return st;
+};
+
+string one_util::log_time(time_t the_time)
+{
+    char time_str[26];
+
+#ifdef SOLARIS
+    ctime_r(&(the_time),time_str,sizeof(char)*26);
+#else
+    ctime_r(&(the_time),time_str);
+#endif
+
+    time_str[24] = '\0'; // Get rid of final enter character
+
+    return string(time_str);
+};
+
+string one_util::log_time()
+{
+    return log_time( time(0) );
+};
+
diff --git a/src/nebula/SConstruct b/src/nebula/SConstruct
index aef1674a7d..7d389a5159 100644
--- a/src/nebula/SConstruct
+++ b/src/nebula/SConstruct
@@ -25,7 +25,7 @@ lib_name='nebula_core'
 source_files=[
     'SystemDB.cc',
     'Nebula.cc',
-    'NebulaTemplate.cc',
+    'NebulaTemplate.cc'
 ]
 
 # Build library