From 602ea6ebf4678150531ad1520d3b7b1666b7760f Mon Sep 17 00:00:00 2001
From: Sam Edwards <CFSworks@gmail.com>
Date: Sat, 13 Oct 2018 15:18:05 -0600
Subject: [PATCH] general: Fix a couple more compiler warnings

- express: Fix a warning when compiling for debug

- dtoolutil: Give TextEncoder a virtual destructor
---
 dtool/src/dtoolutil/textEncoder.h      | 2 ++
 panda/src/express/pointerToArray_ext.I | 1 +
 2 files changed, 3 insertions(+)

diff --git a/dtool/src/dtoolutil/textEncoder.h b/dtool/src/dtoolutil/textEncoder.h
index 71d93a71ca..30004ef5d3 100644
--- a/dtool/src/dtoolutil/textEncoder.h
+++ b/dtool/src/dtoolutil/textEncoder.h
@@ -44,6 +44,8 @@ PUBLISHED:
   INLINE TextEncoder();
   INLINE TextEncoder(const TextEncoder &copy);
 
+  virtual ~TextEncoder() = default;
+
   INLINE void set_encoding(Encoding encoding);
   INLINE Encoding get_encoding() const;
 
diff --git a/panda/src/express/pointerToArray_ext.I b/panda/src/express/pointerToArray_ext.I
index db14284e97..5bcd1b77e9 100644
--- a/panda/src/express/pointerToArray_ext.I
+++ b/panda/src/express/pointerToArray_ext.I
@@ -39,6 +39,7 @@ INLINE void set_matrix_view(Py_buffer &view, int flags, int length, int size, bo
     mat_size = sizeof(UnalignedLMatrix4d);
   } else {
     nassertv_always(false);
+    return; // Make sure compiler knows control flow doesn't proceed.
   }
 
   view.len = length * mat_size;