From 426a3a3fde775b7ff27f69c0168ad7511eb351eb Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Wed, 20 Mar 2019 16:07:42 +1100 Subject: [PATCH] region: make area and diameter constexpr --- region.cpp | 18 ------------------ region.hpp | 4 ++-- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/region.cpp b/region.cpp index f254eb71..1b465b19 100644 --- a/region.cpp +++ b/region.cpp @@ -53,24 +53,6 @@ cruft::region::region (point_t _a, } -//----------------------------------------------------------------------------- -template -T -cruft::region::area (void) const -{ - return e.area (); -} - - -//----------------------------------------------------------------------------- -template -T -cruft::region::diameter (void) const -{ - return e.diameter (); -} - - //----------------------------------------------------------------------------- template typename cruft::region::extent_t diff --git a/region.hpp b/region.hpp index 025e2116..7daf33d2 100644 --- a/region.hpp +++ b/region.hpp @@ -52,8 +52,8 @@ namespace cruft { } //--------------------------------------------------------------------- - T area (void) const; - T diameter (void) const; + constexpr T area (void) const { return e.area (); } + constexpr T diameter (void) const { return e.diameter (); } extent_t magnitude (void) const; extent_t magnitude (extent_t);