From dba65d8bd42835dbd5908d13f4968e5b6312331f Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 3 Nov 2022 10:14:51 +0100 Subject: [PATCH] gobj: Remove TextureStage::write() overload, use default arg instead This was only an overload in 1.10 so that it wouldn't break the ABI --- panda/src/gobj/textureStage.cxx | 8 -------- panda/src/gobj/textureStage.h | 3 +-- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/panda/src/gobj/textureStage.cxx b/panda/src/gobj/textureStage.cxx index cd29b04040..fd46d1055f 100644 --- a/panda/src/gobj/textureStage.cxx +++ b/panda/src/gobj/textureStage.cxx @@ -217,14 +217,6 @@ compare_to(const TextureStage &other) const { return 0; } -/** - * Writes the details of this stage - */ -void TextureStage:: -write(ostream &out) const { - write(out, 0); -} - /** * Writes the details of this stage */ diff --git a/panda/src/gobj/textureStage.h b/panda/src/gobj/textureStage.h index ebbd1ab1a2..22974874a0 100644 --- a/panda/src/gobj/textureStage.h +++ b/panda/src/gobj/textureStage.h @@ -181,8 +181,7 @@ PUBLISHED: int compare_to(const TextureStage &other) const; - void write(std::ostream &out) const; - void write(std::ostream &out, int indent_level) const; + void write(std::ostream &out, int indent_level = 0) const; void output(std::ostream &out) const; INLINE static TextureStage *get_default();