From: Brian Norris Date: Wed, 3 Oct 2012 19:06:20 +0000 (-0700) Subject: mymemory: fix indentation for ModelAlloc X-Git-Tag: pldi2013~109^2~1 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f68607f6e3965c11ad6d870fddf2f0b62cace193;p=model-checker.git mymemory: fix indentation for ModelAlloc --- diff --git a/mymemory.h b/mymemory.h index 47a7ae0..87ee0e9 100644 --- a/mymemory.h +++ b/mymemory.h @@ -61,86 +61,86 @@ void *system_malloc( size_t size ); * warranty, and with no claim as to its suitability for any purpose. */ template - class ModelAlloc { - public: - // type definitions - typedef T value_type; - typedef T* pointer; - typedef const T* const_pointer; - typedef T& reference; - typedef const T& const_reference; - typedef size_t size_type; - typedef size_t difference_type; - - // rebind allocator to type U - template - struct rebind { - typedef ModelAlloc other; - }; - - // return address of values - pointer address (reference value) const { - return &value; - } - const_pointer address (const_reference value) const { - return &value; - } - - /* constructors and destructor - * - nothing to do because the allocator has no state - */ - ModelAlloc() throw() { - } - ModelAlloc(const ModelAlloc&) throw() { - } - template - ModelAlloc (const ModelAlloc&) throw() { - } - ~ModelAlloc() throw() { - } - - // return maximum number of elements that can be allocated - size_type max_size () const throw() { - return std::numeric_limits::max() / sizeof(T); - } - - // allocate but don't initialize num elements of type T - pointer allocate (size_type num, const void* = 0) { - pointer p = ( pointer )model_malloc( num * sizeof( T ) ); - return p; - } - - // initialize elements of allocated storage p with value value - void construct (pointer p, const T& value) { - // initialize memory with placement new - new((void*)p)T(value); - } - - // destroy elements of initialized storage p - void destroy (pointer p) { - // destroy objects by calling their destructor - p->~T(); - } - - // deallocate storage p of deleted elements - void deallocate (pointer p, size_type num) { - model_free((void*)p); - } - }; +class ModelAlloc { + public: + // type definitions + typedef T value_type; + typedef T* pointer; + typedef const T* const_pointer; + typedef T& reference; + typedef const T& const_reference; + typedef size_t size_type; + typedef size_t difference_type; + + // rebind allocator to type U + template + struct rebind { + typedef ModelAlloc other; + }; + + // return address of values + pointer address(reference value) const { + return &value; + } + const_pointer address(const_reference value) const { + return &value; + } + + /* constructors and destructor + * - nothing to do because the allocator has no state + */ + ModelAlloc() throw() { + } + ModelAlloc(const ModelAlloc&) throw() { + } + template + ModelAlloc(const ModelAlloc&) throw() { + } + ~ModelAlloc() throw() { + } + + // return maximum number of elements that can be allocated + size_type max_size() const throw() { + return std::numeric_limits::max() / sizeof(T); + } + + // allocate but don't initialize num elements of type T + pointer allocate(size_type num, const void * = 0) { + pointer p = (pointer)model_malloc(num * sizeof(T)); + return p; + } + + // initialize elements of allocated storage p with value value + void construct(pointer p, const T& value) { + // initialize memory with placement new + new((void*)p)T(value); + } + + // destroy elements of initialized storage p + void destroy(pointer p) { + // destroy objects by calling their destructor + p->~T(); + } + + // deallocate storage p of deleted elements + void deallocate(pointer p, size_type num) { + model_free((void*)p); + } +}; /** Return that all specializations of this allocator are interchangeable. */ - template - bool operator== (const ModelAlloc&, - const ModelAlloc&) throw() { - return true; - } +template +bool operator== (const ModelAlloc&, + const ModelAlloc&) throw() { + return true; +} /** Return that all specializations of this allocator are interchangeable. */ - template - bool operator!= (const ModelAlloc&, - const ModelAlloc&) throw() { - return false; - } +template +bool operator!= (const ModelAlloc&, + const ModelAlloc&) throw() { + return false; +} #ifdef __cplusplus extern "C" {