Skip to content

Commit

Permalink
Merge branch 'feature/METK-121' into hotfix/1.11.7
Browse files Browse the repository at this point in the history
  • Loading branch information
danovaro committed Mar 7, 2024
2 parents 734917b + b5d0c69 commit 561eebc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/metkit/mars/MarsParserContext.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace metkit {
namespace mars {

//----------------------------------------------------------------------------------------------------------------------
MarsParserContext::MarsParserContext(size_t line, size_t /* column */):
MarsParserContext::MarsParserContext(std::size_t line, std::size_t /* column */):
line_(line)
//,column_(column)
{
Expand Down
5 changes: 3 additions & 2 deletions src/metkit/mars/MarsParserContext.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

#include "metkit/mars/MarsExpandContext.h"

#include <cstddef>

namespace metkit {
namespace mars {
Expand All @@ -31,10 +32,10 @@ class MarsParserContext : public MarsExpandContext {

public:

MarsParserContext(size_t, size_t);
MarsParserContext(std::size_t, std::size_t);

private:
size_t line_;
std::size_t line_;
// size_t column_; // unused

virtual void info(std::ostream& out) const;
Expand Down

0 comments on commit 561eebc

Please sign in to comment.