diff options
| author | Sven Gothel <[email protected]> | 2023-08-08 11:22:51 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2023-08-08 11:22:51 +0200 |
| commit | 226a5f35cd2eee3aa24a7daf6f20681f04f8d211 (patch) | |
| tree | 2ffe4b5e5062d4e74c914b26c473686bc8d310cd | |
| parent | e33d67ee14f6a5b999564b40ac0c659db92f2ce0 (diff) | |
JCPP: Resolve another merge conflict
| -rw-r--r-- | src/main/java/com/jogamp/gluegen/jcpp/MacroTokenSource.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/java/com/jogamp/gluegen/jcpp/MacroTokenSource.java b/src/main/java/com/jogamp/gluegen/jcpp/MacroTokenSource.java index 18839c1..ec4bea6 100644 --- a/src/main/java/com/jogamp/gluegen/jcpp/MacroTokenSource.java +++ b/src/main/java/com/jogamp/gluegen/jcpp/MacroTokenSource.java @@ -29,7 +29,6 @@ import static com.jogamp.gluegen.jcpp.Token.*; * in any inactive context. */ /* pp */ class MacroTokenSource extends Source { - private static final Logger LOG = LoggerFactory.getLogger(MacroTokenSource.class); private final Macro macro; private final Iterator<Token> tokens; /* Pointer into the macro. */ |