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

File:

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

src/Common/utility.h

@@ -17 +17 @@
 #define _UTILITY_H
 
+#include <iostream>
+#include <sstream>
+#include <iterator>
+#include <string>
 #include <cctype>
-#include <algorithm>
-#include <iostream>
-#include <iterator>
 #include <list>
-#include <memory>
-#include <sstream>
-#include <string>
 
 template< typename T >
@@ -112 +110 @@
                 return tmp;
         } // if
+}
+
+template< class T, typename ResultType, ResultType( T::* memfunc )() >
+ResultType dispatch( T *pT ) {
+        return (pT->*memfunc)();
 }
 
@@ -158 +161 @@
 }
 
+template< class Constructed, typename Arg >
+Constructed *ctor( Arg arg ) {
+        Constructed *c = new Constructed( arg );
+        return c;
+}
+
+template< class Constructed, typename Arg >
+Constructed ctor_noptr( Arg arg ) {
+        return Constructed( arg );
+}
+
 template< typename T >
 void replace( std::list< T > &org, typename std::list< T >::iterator pos, std::list< T > &with ) {
@@ -170 +184 @@
 }
 
-template< typename... Args >
-auto filter(Args&&... args) -> decltype(std::copy_if(std::forward<Args>(args)...)) {
-  return std::copy_if(std::forward<Args>(args)...);
-}
-
-template< typename... Args >
-auto zip(Args&&... args) -> decltype(zipWith(std::forward<Args>(args)..., std::make_pair)) {
-  return zipWith(std::forward<Args>(args)..., std::make_pair);
+template< typename T1, typename T2 >
+T2 *cast_ptr( T1 *from ) {
+        return dynamic_cast< T2 * >( from );
+}
+
+template< class Exception, typename Arg >
+void inline assert_throw( bool pred, Arg arg ) {
+        if (pred) throw Exception( arg );
+}
+
+template< typename T >
+struct is_null_pointer {
+        bool operator()( const T *ptr ) { return ( ptr == 0 ); }
+};
+
+template< class InputIterator, class OutputIterator, class Predicate >
+void filter(InputIterator begin, InputIterator end, OutputIterator out, Predicate pred) {
+        while ( begin++ != end )
+                if ( pred(*begin) ) *out++ = *begin;
+
+        return;
+}
+
+template< class InputIterator1, class InputIterator2, class OutputIterator >
+void zip( InputIterator1 b1, InputIterator1 e1, InputIterator2 b2, InputIterator2 e2, OutputIterator out ) {
+        while ( b1 != e1 && b2 != e2 )
+                *out++ = std::pair<typename InputIterator1::value_type, typename InputIterator2::value_type>(*b1++, *b2++);
 }
 
@@ -187 +220 @@
 
 // it's nice to actually be able to increment iterators by an arbitrary amount
-template< class InputIt, class Distance >
-InputIt operator+( InputIt it, Distance n ) {
-        advance(it, n);
-        return it;
+template< typename Iterator >
+Iterator operator+(Iterator i, int inc) {
+        while ( inc > 0 ) {
+                ++i;
+                --inc;
+        }
+        return i;
 }
 
@@ -210 +246 @@
 }
 
-// -----------------------------------------------------------------------------
-// Ref Counted Singleton class
-// Objects that inherit from this class will have at most one reference to it
-// but if all references die, the object will be deleted.
-
-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() {
@@ -248 +260 @@
 };
 
-// -----------------------------------------------------------------------------
-// Helper struct and function to support
-// for ( val : reverseIterate( container ) ) {}
-// syntax to have a for each that iterates backwards
-
 template< typename T >
 struct reverseIterate_t {