Changes in src/Common/utility.h [77d2432:b6d7f44]

File:

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

src/Common/utility.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jul 24 14:28:19 2019
-// Update Count     : 41
+// Last Modified On : Sun May  6 22:24:16 2018
+// Update Count     : 40
 //
 
 #pragma once
 
-#include <cassert>
 #include <cctype>
 #include <algorithm>
@@ -27 +26 @@
 #include <string>
 #include <type_traits>
-#include <utility>
-#include <vector>
+
+#include <cassert>
 
 #include "Common/Indenter.h"
-
-class Expression;
-
-/// bring std::move into global scope
-using std::move;
-
-/// partner to move that copies any copyable type
-template<typename T>
-T copy( const T & x ) { return x; }
 
 template< typename T >
@@ -81 +71 @@
 
 template< typename Container >
-void deleteAll( const Container &container ) {
-        for ( const auto &i : container ) {
-                delete i;
+void deleteAll( Container &container ) {
+        for ( typename Container::iterator i = container.begin(); i != container.end(); ++i ) {
+                delete *i;
         } // for
 }
@@ -152 +142 @@
                 return ret;
         } // switch
-}
-
-/// Splice src onto the end of dst, clearing src
-template< typename T >
-void splice( std::vector< T > & dst, std::vector< T > & src ) {
-        dst.reserve( dst.size() + src.size() );
-        for ( T & x : src ) { dst.emplace_back( std::move( x ) ); }
-        src.clear();
-}
-
-/// Splice src onto the begining of dst, clearing src
-template< typename T >
-void spliceBegin( std::vector< T > & dst, std::vector< T > & src ) {
-        splice( src, dst );
-        dst.swap( src );
 }
 
@@ -481 +456 @@
 } // ilog2
 
-// -----------------------------------------------------------------------------
-/// evaluates expr as a long long int. If second is false, expr could not be evaluated
-std::pair<long long int, bool> eval(const Expression * expr);
-
-namespace ast {
-        class Expr;
-}
-
-std::pair<long long int, bool> eval(const ast::Expr * expr);
-
-// -----------------------------------------------------------------------------
-/// Reorders the input range in-place so that the minimal-value elements according to the
-/// comparator are in front;
-/// returns the iterator after the last minimal-value element.
-template<typename Iter, typename Compare>
-Iter sort_mins( Iter begin, Iter end, Compare& lt ) {
-        if ( begin == end ) return end;
-
-        Iter min_pos = begin;
-        for ( Iter i = begin + 1; i != end; ++i ) {
-                if ( lt( *i, *min_pos ) ) {
-                        // new minimum cost; swap into first position
-                        min_pos = begin;
-                        std::iter_swap( min_pos, i );
-                } else if ( ! lt( *min_pos, *i ) ) {
-                        // duplicate minimum cost; swap into next minimum position
-                        ++min_pos;
-                        std::iter_swap( min_pos, i );
-                }
-        }
-        return ++min_pos;
-}
-
-template<typename Iter, typename Compare>
-inline Iter sort_mins( Iter begin, Iter end, Compare&& lt ) {
-        return sort_mins( begin, end, lt );
-}
-
-/// sort_mins defaulted to use std::less
-template<typename Iter>
-inline Iter sort_mins( Iter begin, Iter end ) {
-        return sort_mins( begin, end, std::less<typename std::iterator_traits<Iter>::value_type>{} );
-}
 
 // Local Variables: //