Skip to content

Commit

Permalink
Fix cross build with GCC 12 (#564)
Browse files Browse the repository at this point in the history
* src/base/TunnelUtils.hpp: replace "ETerminal.pb.h" with "Headers.hpp"

Fixes "strings" and "vectors" not having a type.

Headers.hpp already includes ETerminal.pb.h.

* external/cxxopts: update submodule

Needed in order to fix cross build with GCC 12.

Note that the submodule is updated to revision
c74846a891b3cc3bfa992d588b1295f528d43039 which is equal to the tagged
version 3.0.0.

This decision was made due to the changes in master of cxxopts breaking
EternalTerminal (such as removing cxxopts::OptionException from the
code).
  • Loading branch information
kruceter committed Jan 26, 2023
1 parent 88ff139 commit fde8a7c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/base/TunnelUtils.hpp
@@ -1,7 +1,7 @@
#ifndef __ET_TUNNEL_UTILS__
#define __ET_TUNNEL_UTILS__

#include "ETerminal.pb.h"
#include "Headers.hpp"

namespace et {

Expand Down

0 comments on commit fde8a7c

Please sign in to comment.