diff options
| author | Ameer <aj662@drexel.edu> | 2020-07-08 21:15:49 -0400 |
|---|---|---|
| committer | Ameer <aj662@drexel.edu> | 2020-07-08 21:15:49 -0400 |
| commit | 4489ea6f532a501ca4cc379d8d8fb50ce1af27d7 (patch) | |
| tree | 52f62331d39f338f6ae6d0fd56831bdd577943a9 /src/input_common/gcadapter/gc_adapter.h | |
| parent | b57475887be5879347d5fda425676d0bd2e2a3d3 (diff) | |
| parent | 5311b562aa3c619dca9a1a14d0a2b16281a45cc1 (diff) | |
Rebase to master, fix merge conflicts
Diffstat (limited to 'src/input_common/gcadapter/gc_adapter.h')
| -rw-r--r-- | src/input_common/gcadapter/gc_adapter.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/input_common/gcadapter/gc_adapter.h b/src/input_common/gcadapter/gc_adapter.h index cb9d73a8e..a67485586 100644 --- a/src/input_common/gcadapter/gc_adapter.h +++ b/src/input_common/gcadapter/gc_adapter.h @@ -7,6 +7,7 @@ #include <functional> #include <mutex> #include <thread> +#include <unordered_map> #include <libusb.h> #include "common/common_types.h" #include "common/threadsafe_queue.h" |