Ignore:
Timestamp:
Aug 14, 2017, 2:03:39 PM (8 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
Children:
74b007ba
Parents:
fd344aa (diff), 54cd58b0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into references

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/Common/VectorMap.h

    rfd344aa r9236060  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // ScopedMap.h --
     7// VectorMap.h --
    88//
    99// Author           : Aaron B. Moss
    1010// Created On       : Wed Feb  1 16:55:00 2017
    11 // Last Modified By : Aaron B. Moss
    12 // Last Modified On : Wed Feb  1 16:55:00 2017
    13 // Update Count     : 1
    14 //
    15 
    16 #ifndef _VECTORMAP_H
    17 #define _VECTORMAP_H
     11// Last Modified By : Peter A. Buhr
     12// Last Modified On : Fri Jul 21 22:19:29 2017
     13// Update Count     : 2
     14//
     15
     16#pragma once
    1817
    1918#include <iterator>
     
    245244}
    246245
    247 #endif // _VECTORMAP_H
    248 
    249246// Local Variables: //
    250247// tab-width: 4 //
Note: See TracChangeset for help on using the changeset viewer.