OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rt: Make rust_shape.h able to be included in more contexts

This commit is contained in:
Patrick Walton 2011-09-20 16:47:31 -07:00
parent 35016d3147
commit c61691110a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/rt/rust_shape.h
View File

@ -4,6 +4,11 @@
#ifndef RUST_SHAPE_H
#define RUST_SHAPE_H
// Tell ISAAC to let go of max() and min() defines.
#undef max
#undef min
#include <iostream>
#include "rust_internal.h"
// ISAAC pollutes our namespace.
@ -128,7 +133,7 @@ struct size_align {
inline void add(size_t extra_size, size_t extra_align) {
size += extra_size;
alignment = max(alignment, extra_align);
alignment = std::max(alignment, extra_align);
}
static inline size_align make(size_t in_size) {