Skip to content

Commit

Permalink
Fix build error resulting from not rebasing before merge (#84)
Browse files Browse the repository at this point in the history
  • Loading branch information
dlurton authored Jun 16, 2021
1 parent c94488c commit 4856472
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions pig-runtime/src/org/partiql/pig/runtime/BoolPrimitive.kt
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ class BoolPrimitive(val value: Boolean, override val metas: MetaContainer) : Dom
fun copy(value: Boolean = this.value, metas: MetaContainer = this.metas): BoolPrimitive =
BoolPrimitive(value, metas)

/** Creates a copy of the current [BoolPrimitive] with [newMetas] as the new metas. */
override fun copyMetas(newMetas: MetaContainer): BoolPrimitive =
BoolPrimitive(value, newMetas)
/** Creates a copy of the current [BoolPrimitive] with [metas] as the new metas. */
override fun copy(metas: MetaContainer): BoolPrimitive =
BoolPrimitive(value, metas)

/** Creates a copy of the current [BoolPrimitive] with the specified additional meta. */
override fun withMeta(metaKey: String, metaValue: Any): BoolPrimitive =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1449,11 +1449,11 @@ class TestDomain private constructor() {
override val metas: MetaContainer = emptyMetaContainer()
): TestDomainNode() {

override fun copyMetas(newMetas: MetaContainer): BoolPair =
override fun copy(metas: MetaContainer): BoolPair =
BoolPair(
first = first,
second = second,
metas = newMetas)
metas = metas)

override fun withMeta(metaKey: String, metaValue: Any): BoolPair =
BoolPair(
Expand Down

0 comments on commit 4856472

Please sign in to comment.