Use the util namespace for more classes

nocopy.hpp

@@ -22,6 +22,7 @@
 
 #include "debug.hpp"
 
+namespace util {
     class nocopy {
         public:
             nocopy () { ; }
@@ -30,5 +31,6 @@ class nocopy {
             nocopy            (const nocopy &) = delete;
             nocopy& operator =(const nocopy &) = delete;
     };
+}
 
 #endif

noncopyable.hpp

@@ -1,23 +0,0 @@
-//  Derived from boost::noncopyable
-//
-//  (C) Copyright Beman Dawes 1999-2003. Distributed under the Boost
-//  Software License, Version 1.0. (See accompanying file
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-//  Contributed by Dave Abrahams
-
-#ifndef __UTIL_NONCOPYABLE_HPP
-#define __UTIL_NONCOPYABLE_HPP
-
-class noncopyable
-{
-    protected:
-      noncopyable()  {}
-      ~noncopyable() {}
-
-    private:  // emphasize the following members are private
-      noncopyable( const noncopyable& );
-      const noncopyable& operator=( const noncopyable& );
-};
-
-#endif

pool.cpp

@@ -22,4 +22,4 @@
 
 
 // Explicitly instance a possibly useful specialisation so that we can more easily catch linker errors.
-template class pool<std::string>;
+template class util::pool<std::string>;

pool.hpp

@@ -22,7 +22,7 @@
 
 #include "nocopy.hpp"
 
-
+namespace util {
 template <typename T>
     class pool : public nocopy {
         protected:
@@ -95,6 +95,6 @@ class pool : public nocopy {
                 m_next = newnode;
             }
     };
-
+}
 
 #endif // __UTIL_POOL_HPP

version.cpp.rl

@@ -20,12 +20,14 @@
 
 #include "version.hpp"
 
+#include <cstring>
 #include <stdexcept>
 
 #include "debug.hpp"
 
 
 using namespace std;
+using namespace util;
 
 
 version::version (unsigned int _major,
@@ -45,6 +47,14 @@ version::version (const string& str):
 }
 
 
+version::version (const char *str):
+        m_values  (NUM_OFFSETS, 0),
+        m_release (RELEASE_PRODUCTION) {
+    m_values.clear ();
+    parse (str);
+}
+
+
 static void
 check_release (version::release_t r) {
     switch (r) {
@@ -109,6 +119,20 @@ version::parse (const string& str) {
 }
 
 
+void
+version::parse (const char *str) {
+    unsigned int current;
+
+    size_t      cs;
+    const char *p   = str,
+               *pe  = str + strlen (str),
+               *eof = pe;
+
+    %%write init;
+    %%write exec;
+}
+
+
 static string
 release_string (const version::release_t r) {
     switch (r) {
@@ -140,8 +164,9 @@ version::operator > (const version &rhs) const {
 }
 
 
+namespace util {
     ostream&
-operator <<(ostream& os, const version& rhs) {
+    operator <<(ostream& os, const util::version& rhs) {
         auto i = rhs.m_values.begin();
         os << *i; ++i;
 
@@ -151,4 +176,5 @@ operator <<(ostream& os, const version& rhs) {
         os << release_string (rhs.m_release);
         return os;
     }
+}
 

version.hpp

@@ -25,6 +25,7 @@
 #include <iostream>
 
 
+namespace util {
     class version {
         public:
             enum release_t {
@@ -37,6 +38,8 @@ class version {
             version (unsigned int _major,
                      unsigned int _minor);
             version (const std::string& str);
+            version (const char *str);
+
             virtual ~version () { ; }
 
             virtual void sanity (void) const;
@@ -55,6 +58,7 @@ class version {
             release_t                   m_release;
 
             void parse (const std::string&);
+            void parse (const char*);
 
         public:
 
@@ -78,9 +82,7 @@ class version {
             friend std::ostream&
             operator <<(std::ostream& os, const version& rhs);
     };
+}
 
 
-std::ostream&
-operator <<(std::ostream& os, const version& rhs);
-
 #endif // __VERSION_HPP