Changes in src/Common/utility.h [234223f:bc3127d]

File:

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

src/Common/utility.h

@@ -174 +174 @@
 }
 
+template <typename E, typename UnaryPredicate, template< typename, typename...> class Container, typename... Args >
+void filter( Container< E *, Args... > & container, UnaryPredicate pred, bool doDelete ) {
+        auto i = begin( container );
+        while ( i != end( container ) ) {
+                auto it = next( i );
+                if ( pred( *i ) ) {
+                        if ( doDelete ) {
+                                delete *i;
+                        } // if
+                        container.erase( i );
+                } // if
+                i = it;
+        } // while
+}
+
 template< typename... Args >
 auto zip(Args&&... args) -> decltype(zipWith(std::forward<Args>(args)..., std::make_pair)) {
@@ -207 +222 @@
         std::cerr << "Warning: ";
         warn_single( params... );
+}
+
+/// determines if `pref` is a prefix of `str`
+static inline bool isPrefix( const std::string & str, const std::string & pref ) {
+        if ( pref.size() > str.size() ) return false;
+        auto its = std::mismatch( pref.begin(), pref.end(), str.begin() );
+        return its.first == pref.end();
 }
 
@@ -255 +277 @@
         ~ValueGuardPtr() { if( ref ) *ref = old; }
 };
-
-template< typename aT >
-struct FuncGuard {
-        aT m_after;
-
-        template< typename bT >
-        FuncGuard( bT before, aT after ) : m_after( after ) {
-                before();
-        }
-
-        ~FuncGuard() {
-                m_after();
-        }
-};
-
-template< typename bT, typename aT >
-FuncGuard<aT> makeFuncGuard( bT && before, aT && after ) {
-        return FuncGuard<aT>( std::forward<bT>(before), std::forward<aT>(after) );
-}
 
 template< typename T >