Skip to content

Commit

Permalink
Merge 'trilinos/Trilinos:develop' (b1a864d) into 'tcad-charon/Trilino…
Browse files Browse the repository at this point in the history
…s:develop' (d1bea2b).

* trilinos-develop:
  Fix trilinos#10892
  • Loading branch information
Charonops Jenkins Pipeline committed Aug 19, 2022
2 parents d1bea2b + b1a864d commit 8906842
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 10 deletions.
3 changes: 0 additions & 3 deletions packages/teuchos/core/src/Teuchos_Utils.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@ namespace Teuchos
{
public:

/** \brief print a description of the current build. */
static void aboutBuild();

/** \brief Set a number to zero if it is less than
* <tt>getChopVal()</tt>. */
static double chop(const double& x);
Expand Down
6 changes: 0 additions & 6 deletions packages/teuchos/parser/src/Teuchos_FiniteAutomaton.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -414,12 +414,6 @@ void simplify(FiniteAutomaton& result, FiniteAutomaton const& fa) {
swap(result, next);
}

void make_char_nfa(FiniteAutomaton& result, bool is_deterministic_init, int nstates_reserve) {
using std::swap;
FiniteAutomaton tmp(Teuchos::NCHARS, is_deterministic_init, nstates_reserve);
swap(result, tmp);
}

void add_char_transition(FiniteAutomaton& fa, int from_state, char at_char, int to_state) {
add_transition(fa, from_state, get_symbol(at_char), to_state);
}
Expand Down
1 change: 0 additions & 1 deletion packages/teuchos/parser/src/Teuchos_FiniteAutomaton.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ void make_deterministic(FiniteAutomaton& result, FiniteAutomaton& nfa);
void simplify_once(FiniteAutomaton& result, FiniteAutomaton const& fa);
void simplify(FiniteAutomaton& result, FiniteAutomaton const& fa);

FiniteAutomaton make_char_nfa(bool is_deterministic_init, int nstates_reserve);
void add_char_transition(FiniteAutomaton& fa, int from_state, char at_char, int to_state);
bool is_symbol(char c);
int get_symbol(char c);
Expand Down

0 comments on commit 8906842

Please sign in to comment.