summaryrefslogtreecommitdiff
path: root/tests/test_cpp.cc
diff options
context:
space:
mode:
authorJosh Haberman <jhaberman@gmail.com>2014-02-04 15:43:52 -0800
committerJosh Haberman <jhaberman@gmail.com>2014-02-04 15:43:52 -0800
commit7d565f1e7a0f107506d3cf31ef2e33e22a504d2b (patch)
tree151a5102b0ded6e8ad098a86e692c1d14e390167 /tests/test_cpp.cc
parent0fd2f830882402979a83010e89650e7245960d39 (diff)
Sync from Google development.
Diffstat (limited to 'tests/test_cpp.cc')
-rw-r--r--tests/test_cpp.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/test_cpp.cc b/tests/test_cpp.cc
index c4313e1..60d6527 100644
--- a/tests/test_cpp.cc
+++ b/tests/test_cpp.cc
@@ -12,10 +12,7 @@
#include <iostream>
#include <set>
-
-#ifdef UPB_CXX11
#include <type_traits>
-#endif
#include "upb/def.h"
#include "upb/descriptor/reader.h"
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback