Skip to content

Commit

Permalink
fix test_map_in_map.cc compilation error
Browse files Browse the repository at this point in the history
fix issue iovisor#2679 where test_map_in_map.cc has a
compilation error on ppc64le due to conflicting
type __u64. Let us just remove the typedef.

Signed-off-by: Yonghong Song <[email protected]>
  • Loading branch information
yonghong-song committed Jan 2, 2020
1 parent dc336aa commit 5098c9d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions tests/cc/test_map_in_map.cc
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include "catch.hpp"

#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
typedef unsigned long long __u64;

TEST_CASE("test hash of maps", "[hash_of_maps]") {
{
Expand Down Expand Up @@ -67,7 +66,7 @@ TEST_CASE("test hash of maps", "[hash_of_maps]") {
auto t = bpf.get_map_in_map_table("maps_hash");
auto ex1_table = bpf.get_array_table<int>("ex1");
auto ex2_table = bpf.get_array_table<int>("ex2");
auto ex3_table = bpf.get_array_table<__u64>("ex3");
auto ex3_table = bpf.get_array_table<unsigned long long>("ex3");
int ex1_fd = ex1_table.get_fd();
int ex2_fd = ex2_table.get_fd();
int ex3_fd = ex3_table.get_fd();
Expand Down Expand Up @@ -162,7 +161,8 @@ TEST_CASE("test array of maps", "[array_of_maps]") {
auto t = bpf.get_map_in_map_table("maps_array");
auto ex1_table = bpf.get_hash_table<int, int>("ex1");
auto ex2_table = bpf.get_hash_table<int, int>("ex2");
auto ex3_table = bpf.get_hash_table<__u64, __u64>("ex3");
auto ex3_table =
bpf.get_hash_table<unsigned long long, unsigned long long>("ex3");
int ex1_fd = ex1_table.get_fd();
int ex2_fd = ex2_table.get_fd();
int ex3_fd = ex3_table.get_fd();
Expand Down

0 comments on commit 5098c9d

Please sign in to comment.