mpp: remove compact namespace

Originally there were two families: compact and bitmask. In order
not to be confused compact was placed in 'compact' namespace.

Since family bitmask was removed in the previous commit, there's
no more need in compact namespace.

Author: alyapunov

src/mpp/Constants.hpp

@@ -36,7 +36,6 @@
 
 namespace mpp {
 
-namespace compact {
 enum Family : uint8_t {
 	MP_NIL  /* = 0x00 */,
 	MP_IGNR  /* = 0x01 */,
@@ -50,7 +49,6 @@ enum Family : uint8_t {
 	MP_EXT  /* = 0x09 */,
 	MP_END
 };
-} // namespace compact {
 
 inline const char *FamilyName[] = {
 	"MP_NIL",
@@ -66,7 +64,7 @@ inline const char *FamilyName[] = {
 	"MP_BAD",
 	"MP_NONE"
 };
-static_assert(std::size(FamilyName) == compact::MP_END + 2, "Smth is forgotten");
+static_assert(std::size(FamilyName) == MP_END + 2, "Smth is forgotten");
 
 inline const char *FamilyHumanName[] = {
 	"nil",
@@ -82,32 +80,32 @@ inline const char *FamilyHumanName[] = {
 	"bad",
 	"none"
 };
-static_assert(std::size(FamilyHumanName) == compact::MP_END + 2, "Smth is forgotten");
+static_assert(std::size(FamilyHumanName) == MP_END + 2, "Smth is forgotten");
 
 inline std::ostream&
-operator<<(std::ostream& strm, compact::Family t)
+operator<<(std::ostream& strm, Family t)
 {
-	if (t >= compact::Family::MP_END)
-		return strm << FamilyName[compact::Family::MP_END]
+	if (t >= Family::MP_END)
+		return strm << FamilyName[Family::MP_END]
 			    << "(" << static_cast<uint64_t>(t) << ")";
 	return strm << FamilyName[t];
 }
 
-template <compact::Family ...FAMILY>
+template <Family ...FAMILY>
 struct family_sequence {
 	static constexpr std::size_t size() noexcept
 	{
 		return sizeof ...(FAMILY);
 	}
 };
 
-template <compact::Family NEW_FAMILY, compact::Family... FAMILY>
+template <Family NEW_FAMILY, Family... FAMILY>
 static constexpr auto family_sequence_populate(struct family_sequence<FAMILY...>)
 {
 	return family_sequence<NEW_FAMILY, FAMILY...>{};
 }
 
-template <compact::Family ...FAMILY_A, compact::Family ...FAMILY_B>
+template <Family ...FAMILY_A, Family ...FAMILY_B>
 inline constexpr auto
 operator+(family_sequence<FAMILY_A...>, family_sequence<FAMILY_B...>)
 {
@@ -116,51 +114,51 @@ operator+(family_sequence<FAMILY_A...>, family_sequence<FAMILY_B...>)
 
 namespace details {
 
-template <compact::Family NEEDLE, compact::Family HEAD, compact::Family ...TAIL>
+template <Family NEEDLE, Family HEAD, Family ...TAIL>
 struct family_sequence_contains_impl_h {
 	static constexpr bool value =
 		family_sequence_contains_impl_h<NEEDLE, TAIL...>::value;
 };
 
-template <compact::Family NEEDLE, compact::Family LAST>
+template <Family NEEDLE, Family LAST>
 struct family_sequence_contains_impl_h<NEEDLE, LAST> {
 	static constexpr bool value = false;
 };
 
-template <compact::Family NEEDLE, compact::Family ...TAIL>
+template <Family NEEDLE, Family ...TAIL>
 struct family_sequence_contains_impl_h<NEEDLE, NEEDLE, TAIL...> {
 	static constexpr bool value = true;
 };
 
-template <compact::Family NEEDLE>
+template <Family NEEDLE>
 struct family_sequence_contains_impl_h<NEEDLE, NEEDLE> {
 	static constexpr bool value = true;
 };
 
-template <compact::Family NEEDLE, compact::Family ...HAYSTACK>
+template <Family NEEDLE, Family ...HAYSTACK>
 struct family_sequence_contains_h {
 	static constexpr bool value =
 		family_sequence_contains_impl_h<NEEDLE, HAYSTACK...>::value;
 };
 
-template <compact::Family NEEDLE>
+template <Family NEEDLE>
 struct family_sequence_contains_h<NEEDLE> {
 	static constexpr bool value = false;
 };
 
 } // namespace details
 
-template <compact::Family NEEDLE, compact::Family ...HAYSTACK>
+template <Family NEEDLE, Family ...HAYSTACK>
 static constexpr bool family_sequence_contains(family_sequence<HAYSTACK...>) {
 	return details::family_sequence_contains_h<NEEDLE, HAYSTACK...>::value;
 }
 
-template <compact::Family ...FAMILY>
+template <Family ...FAMILY>
 std::ostream&
 operator<<(std::ostream& strm, family_sequence<FAMILY...>)
 {
 	if (sizeof ...(FAMILY) == 0)
-		return strm << FamilyName[compact::Family::MP_END + 1];
+		return strm << FamilyName[Family::MP_END + 1];
 	size_t count = 0;
 	((strm << (count++ ? ", " : "") << FamilyName[FAMILY]), ...);
 	return strm;