diff options
| author | Patrick Simianer <simianer@cl.uni-heidelberg.de> | 2012-11-05 15:29:46 +0100 |
|---|---|---|
| committer | Patrick Simianer <simianer@cl.uni-heidelberg.de> | 2012-11-05 15:29:46 +0100 |
| commit | 1db70a45d59946560fbd5db6487b55a8674ef973 (patch) | |
| tree | 172585dafe4d1462f22d8200e733d52dddb55b1e /klm/util/string_piece.hh | |
| parent | 4dd5216d3afa9ab72b150e250a3c30a5f223ce53 (diff) | |
| parent | 6bbf03ac46bd57400aa9e65a321a304a234af935 (diff) | |
merge upstream/master
Diffstat (limited to 'klm/util/string_piece.hh')
| -rw-r--r-- | klm/util/string_piece.hh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/klm/util/string_piece.hh b/klm/util/string_piece.hh index 5de053aa..be6a643d 100644 --- a/klm/util/string_piece.hh +++ b/klm/util/string_piece.hh @@ -85,6 +85,11 @@ U_NAMESPACE_BEGIN #include <string> #include <string.h> +#ifdef WIN32 +#undef max +#undef min +#endif + class StringPiece { public: typedef size_t size_type; |