From 220f280c0224aff4d1f5e3a97a1524b7f637f839 Mon Sep 17 00:00:00 2001 From: James Cherry Date: Fri, 3 Jul 2020 12:11:23 -0700 Subject: [PATCH] Delay*.hh protects --- graph/DelayNormal1.cc | 6 +++--- graph/DelayNormal2.cc | 6 +++--- include/sta/Delay.hh | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/graph/DelayNormal1.cc b/graph/DelayNormal1.cc index 344a3c1f..1042bbdb 100644 --- a/graph/DelayNormal1.cc +++ b/graph/DelayNormal1.cc @@ -14,6 +14,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +// SSTA compilation. +#if (SSTA == 1) + #include "Delay.hh" #include // sqrt @@ -27,9 +30,6 @@ // temporary hack #include "Sta.hh" -// SSTA compilation. -#if (SSTA == 1) - namespace sta { inline float diff --git a/graph/DelayNormal2.cc b/graph/DelayNormal2.cc index 8b6f02ba..9ab1432a 100644 --- a/graph/DelayNormal2.cc +++ b/graph/DelayNormal2.cc @@ -14,6 +14,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +// SSTA compilation. +#if (SSTA == 2) + #include "Delay.hh" #include // sqrt @@ -25,9 +28,6 @@ #include "Units.hh" #include "StaState.hh" -// SSTA compilation. -#if (SSTA == 2) - namespace sta { inline float diff --git a/include/sta/Delay.hh b/include/sta/Delay.hh index 06ca2929..5b68ae8c 100644 --- a/include/sta/Delay.hh +++ b/include/sta/Delay.hh @@ -14,10 +14,10 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "StaConfig.hh" - #pragma once +#include "StaConfig.hh" + #if (SSTA == 1) // Delays are Normal PDFs. #include "DelayNormal1.hh"