Ignore:
Timestamp:
May 13, 2024, 7:07:06 AM (17 months ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
master
Children:
ca4f2b2
Parents:
ec20ab9 (diff), 5f225f5 (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:

fix merge

File:
1 moved

Legend:

Unmodified
Added
Removed
  • src/ResolvExpr/Unify.cpp

    rec20ab9 rbf4fe05  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // Unify.cc --
     7// Unify.cpp --
    88//
    99// Author           : Richard C. Bilson
     
    1414//
    1515
    16 #include "Unify.h"
     16#include "Unify.hpp"
    1717
    1818#include <cassert>                  // for assertf, assert
     
    3232#include "AST/Type.hpp"
    3333#include "AST/TypeEnvironment.hpp"
    34 #include "Common/Eval.h          // for eval
     34#include "Common/Eval.hpp"          // for eval
    3535#include "CommonType.hpp"           // for commonType
    36 #include "FindOpenVars.h         // for findOpenVars
     36#include "FindOpenVars.hpp"         // for findOpenVars
    3737#include "SpecCost.hpp"             // for SpecCost
    38 #include "Tuples/Tuples.h        // for isTtype
    39 #include "typeops.h"                // for flatten, occurs
     38#include "Tuples/Tuples.hpp"        // for isTtype
     39#include "Typeops.hpp"              // for flatten, occurs
    4040
    4141namespace ast {
Note: See TracChangeset for help on using the changeset viewer.