From edbd61ad42731cebc9bad4da23875f199d3190dd Mon Sep 17 00:00:00 2001
From: Neargye <neargye@gmail.com>
Date: Fri, 4 May 2018 00:46:41 +0500
Subject: [PATCH] clean-up

---
 example/example.cpp | 14 ++++++--------
 test/test.cpp       | 22 ++++++----------------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/example/example.cpp b/example/example.cpp
index cbf8077..d1c7d2e 100644
--- a/example/example.cpp
+++ b/example/example.cpp
@@ -49,17 +49,15 @@ struct Long {
   LL ll;
 };
 
-int somevar;
-
 enum class Color { RED, GREEN, BLUE };
 
-int main() {
-  SomeStruct somevar;
-  Long othervar;
-  int intvar;
-  SomeStruct* ptrvar;
-  SomeStruct** ptrptrvar;
+SomeStruct somevar;
+Long othervar;
+int intvar;
+SomeStruct* ptrvar;
+SomeStruct** ptrptrvar;
 
+int main() {
   // constexpr
   constexpr auto constexpr_work_fine = NAMEOF(intvar);
   std::cout << constexpr_work_fine << std::endl; // intvar
diff --git a/test/test.cpp b/test/test.cpp
index 7ca18ea..c8b36e3 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -53,13 +53,15 @@ struct Long {
   LL ll;
 };
 
-int somevar;
-
 enum class Color { RED, GREEN, BLUE };
 
-TEST_CASE("constexpr") {
-  SomeStruct somevar;
+SomeStruct somevar;
+Long othervar;
+int intvar;
+SomeStruct* ptrvar;
+SomeStruct** ptrptrvar;
 
+TEST_CASE("constexpr") {
   SECTION("NAMEOF") {
     // variable
     constexpr auto cx1 = NAMEOF((&somevar)->somefield);
@@ -98,12 +100,6 @@ TEST_CASE("constexpr") {
 }
 
 TEST_CASE("NAMEOF") {
-  SomeStruct somevar;
-  Long othervar;
-  int intvar;
-  SomeStruct* ptrvar;
-  SomeStruct** ptrptrvar;
-
   SECTION("variable") {
     REQUIRE(std::strcmp(NAMEOF(somevar), "somevar") == 0);
     REQUIRE(std::strcmp(NAMEOF(&somevar), "somevar") == 0);
@@ -156,12 +152,6 @@ TEST_CASE("NAMEOF") {
 }
 
 TEST_CASE("NAMEOF_FULL") {
-  SomeStruct somevar;
-  Long othervar;
-  int intvar;
-  SomeStruct* ptrvar;
-  SomeStruct** ptrptrvar;
-
   SECTION("variable") {
     REQUIRE(std::strcmp(NAMEOF_FULL(somevar), "somevar") == 0);
     REQUIRE(std::strcmp(NAMEOF_FULL(&somevar), "&somevar") == 0);