Changes in src/Common/utility.h [1f75e2d:1ba88a0]

File:

• src/Common/utility.h (modified) (2 diffs)

src/Common/utility.h

@@ -17 +17 @@
 #define _UTILITY_H
 
+#include <iostream>
+#include <sstream>
+#include <iterator>
+#include <string>
 #include <cctype>
-#include <iostream>
-#include <iterator>
 #include <list>
-#include <memory>
-#include <sstream>
-#include <string>
 
 template< typename T >
@@ -247 +246 @@
 }
 
-template< typename ThisType >
-class RefCountSingleton {
-  public:
-        static std::shared_ptr<ThisType> get() {
-                if( global_instance.expired() ) {
-                        std::shared_ptr<ThisType> new_instance = std::make_shared<ThisType>();
-                        global_instance = new_instance;
-                        return std::move(new_instance);
-                }
-                return global_instance.lock();
-        }
-  private:
-        static std::weak_ptr<ThisType> global_instance;
-};
-
-template< typename ThisType >
-std::weak_ptr<ThisType> RefCountSingleton<ThisType>::global_instance;
+// RAII object to regulate "save and restore" behaviour, e.g.
+// void Foo::bar() {
+//   ValueGuard<int> guard(var); // var is a member of type Foo
+//   var = ...;
+// } // var's original value is restored
+template< typename T >
+struct ValueGuard {
+        T old;
+        T& ref;
+
+        ValueGuard(T& inRef) : old(inRef), ref(inRef) {}
+        ~ValueGuard() { ref = old; }
+};
+
+template< typename T >
+struct reverseIterate_t {
+        T& ref;
+
+        reverseIterate_t( T & ref ) : ref(ref) {}
+
+        typedef typename T::reverse_iterator iterator;
+        iterator begin() { return ref.rbegin(); }
+        iterator end() { return ref.rend(); }
+};
+
+template< typename T >
+reverseIterate_t< T > reverseIterate( T & ref ) {
+        return reverseIterate_t< T >( ref );
+}
 
 #endif // _UTILITY_H