Require semicolon after Y_DECLARE*_FLAGS

14 files changed, 35 insertions, 34 deletions

diff --git a/library/cpp/actors/wilson/wilson_span.h b/library/cpp/actors/wilson/wilson_span.h
index 05dd5a8343..d470c02c0e 100644
--- a/library/cpp/actors/wilson/wilson_span.h
+++ b/library/cpp/actors/wilson/wilson_span.h
@@ -43,8 +43,8 @@ namespace NWilson {
         AUTO_END = 1,
     };
 
-    Y_DECLARE_FLAGS(TFlags, EFlags)
-    Y_DECLARE_OPERATORS_FOR_FLAGS(TFlags)
+    Y_DECLARE_FLAGS(TFlags, EFlags);
+    Y_DECLARE_OPERATORS_FOR_FLAGS(TFlags);
 
     class TSpan {
         struct TData {
diff --git a/library/cpp/neh/http_common.h b/library/cpp/neh/http_common.h
index 91b4ca1356..a96f10a200 100644
--- a/library/cpp/neh/http_common.h
+++ b/library/cpp/neh/http_common.h
@@ -267,8 +267,8 @@ namespace NNeh {
             AbsoluteUri = 1,
         };
 
-        Y_DECLARE_FLAGS(ERequestFlags, ERequestFlag)
-        Y_DECLARE_OPERATORS_FOR_FLAGS(ERequestFlags)
+        Y_DECLARE_FLAGS(ERequestFlags, ERequestFlag);
+        Y_DECLARE_OPERATORS_FOR_FLAGS(ERequestFlags);
 
         static constexpr ERequestType DefaultRequestType = ERequestType::Any;
 
diff --git a/util/folder/filelist.h b/util/folder/filelist.h
index 3f615fa4c2..8851323bab 100644
--- a/util/folder/filelist.h
+++ b/util/folder/filelist.h
@@ -17,7 +17,7 @@ public:
         EM_DIRS_SLINKS = EM_DIRS | EM_SLINKS,
         EM_FILES_DIRS_SLINKS = EM_FILES | EM_DIRS | EM_SLINKS
     };
-    Y_DECLARE_FLAGS(EMask, EMaskFlag)
+    Y_DECLARE_FLAGS(EMask, EMaskFlag);
 
     TFileEntitiesList(EMask mask)
         : Mask(mask)
@@ -62,7 +62,7 @@ protected:
     EMask Mask;
 };
 
-Y_DECLARE_OPERATORS_FOR_FLAGS(TFileEntitiesList::EMask)
+Y_DECLARE_OPERATORS_FOR_FLAGS(TFileEntitiesList::EMask);
 
 class TFileList: public TFileEntitiesList {
 public:
diff --git a/util/generic/flags.h b/util/generic/flags.h
index a1f5921d42..2e8d6b93d0 100644
--- a/util/generic/flags.h
+++ b/util/generic/flags.h
@@ -23,12 +23,12 @@ namespace NPrivate {
  *         Vertical = 1,
  *         Horizontal = 2
  *     };
- *     Y_DECLARE_FLAGS(EOrientations, EOrientation)
+ *     Y_DECLARE_FLAGS(EOrientations, EOrientation);
  *
  *     // ...
  * };
  *
- * Y_DECLARE_OPERATORS_FOR_FLAGS(TAligner::EOrientations)
+ * Y_DECLARE_OPERATORS_FOR_FLAGS(TAligner::EOrientations);
  * @endcode
  */
 template <class Enum>
@@ -224,7 +224,7 @@ struct THash<TFlags<Enum>> {
  * @param ENUM                          Name of the base enum type to use.
  */
 #define Y_DECLARE_FLAGS(FLAGS, ENUM) \
-    using FLAGS = TFlags<ENUM>;
+    using FLAGS = TFlags<ENUM>
 
 /**
  * This macro declares global operator functions for enum base of `FLAGS` type.
@@ -241,4 +241,5 @@ struct THash<TFlags<Enum>> {
     Y_DECLARE_UNUSED                                                   \
     constexpr inline FLAGS operator~(FLAGS::TEnum value) {             \
         return ~FLAGS(value);                                          \
-    }
+    }                                                                  \
+    Y_SEMICOLON_GUARD
diff --git a/util/generic/flags_ut.cpp b/util/generic/flags_ut.cpp
index 5377c6a058..5ea5771591 100644
--- a/util/generic/flags_ut.cpp
+++ b/util/generic/flags_ut.cpp
@@ -8,8 +8,8 @@ enum ETestFlag1: ui16 {
     Test4 = 4,
     Test8 = 8
 };
-Y_DECLARE_FLAGS(ETest1, ETestFlag1)
-Y_DECLARE_OPERATORS_FOR_FLAGS(ETest1)
+Y_DECLARE_FLAGS(ETest1, ETestFlag1);
+Y_DECLARE_OPERATORS_FOR_FLAGS(ETest1);
 
 static_assert(TTypeTraits<ETest1>::IsPod, "flags should be POD type");
 
@@ -19,16 +19,16 @@ enum class ETestFlag2 {
     Test4 = 4,
     Test8 = 8
 };
-Y_DECLARE_FLAGS(ETest2, ETestFlag2)
-Y_DECLARE_OPERATORS_FOR_FLAGS(ETest2)
+Y_DECLARE_FLAGS(ETest2, ETestFlag2);
+Y_DECLARE_OPERATORS_FOR_FLAGS(ETest2);
 
 namespace {
     // won't compile without Y_DECLARE_UNUSED
     enum class ETestFlag3 { One = 1,
                             Two = 2,
                             Three = 3 };
-    Y_DECLARE_FLAGS(ETestFlags3, ETestFlag3)
-    Y_DECLARE_OPERATORS_FOR_FLAGS(ETestFlags3)
+    Y_DECLARE_FLAGS(ETestFlags3, ETestFlag3);
+    Y_DECLARE_OPERATORS_FOR_FLAGS(ETestFlags3);
 }
 
 Y_UNIT_TEST_SUITE(TFlagsTest) {
diff --git a/util/stream/format.h b/util/stream/format.h
index daba3b8a05..dc46684b39 100644
--- a/util/stream/format.h
+++ b/util/stream/format.h
@@ -13,8 +13,8 @@ enum ENumberFormatFlag {
     HF_FULL = 0x01, /**< Output number with leading zeros. */
     HF_ADDX = 0x02, /**< Output '0x' or '0b' before hex/bin digits. */
 };
-Y_DECLARE_FLAGS(ENumberFormat, ENumberFormatFlag)
-Y_DECLARE_OPERATORS_FOR_FLAGS(ENumberFormat)
+Y_DECLARE_FLAGS(ENumberFormat, ENumberFormatFlag);
+Y_DECLARE_OPERATORS_FOR_FLAGS(ENumberFormat);
 
 enum ESizeFormat {
     SF_QUANTITY, /**< Base 1000, usual suffixes. 1100 gets turned into "1.1K". */
diff --git a/util/system/file.h b/util/system/file.h
index 9502e159b6..bb42bc7697 100644
--- a/util/system/file.h
+++ b/util/system/file.h
@@ -49,8 +49,8 @@ enum EOpenModeFlag {
     AMask = 0x0FFF0000,
 };
 
-Y_DECLARE_FLAGS(EOpenMode, EOpenModeFlag)
-Y_DECLARE_OPERATORS_FOR_FLAGS(EOpenMode)
+Y_DECLARE_FLAGS(EOpenMode, EOpenModeFlag);
+Y_DECLARE_OPERATORS_FOR_FLAGS(EOpenMode);
 
 TString DecodeOpenMode(ui32 openMode);
 
diff --git a/util/system/filemap.h b/util/system/filemap.h
index f66b70c96c..933d169adb 100644
--- a/util/system/filemap.h
+++ b/util/system/filemap.h
@@ -58,7 +58,7 @@ struct TMemoryMapCommon {
         oPrecharge = 16,
         oPopulate = 32, // Populate page table entries (see mmap's MAP_POPULATE)
     };
-    Y_DECLARE_FLAGS(EOpenMode, EOpenModeFlag)
+    Y_DECLARE_FLAGS(EOpenMode, EOpenModeFlag);
 
     /**
      * Name that will be printed in exceptions if not specified.
@@ -66,7 +66,7 @@ struct TMemoryMapCommon {
      */
     static const TString& UnknownFileName();
 };
-Y_DECLARE_OPERATORS_FOR_FLAGS(TMemoryMapCommon::EOpenMode)
+Y_DECLARE_OPERATORS_FOR_FLAGS(TMemoryMapCommon::EOpenMode);
 
 class TMemoryMap: public TMemoryMapCommon {
 public:
diff --git a/util/system/fs.h b/util/system/fs.h
index 4c1951b250..a28a6d84fb 100644
--- a/util/system/fs.h
+++ b/util/system/fs.h
@@ -21,7 +21,7 @@ namespace NFs {
         FP_NONSECRET_FILE = 0744,
     };
 
-    Y_DECLARE_FLAGS(EFilePermissions, EFilePermission)
+    Y_DECLARE_FLAGS(EFilePermissions, EFilePermission);
 
     /// Remove a file or empty directory
     ///
@@ -154,4 +154,4 @@ namespace NFs {
     }
 }
 
-Y_DECLARE_OPERATORS_FOR_FLAGS(NFs::EFilePermissions)
+Y_DECLARE_OPERATORS_FOR_FLAGS(NFs::EFilePermissions);
diff --git a/util/system/mlock.h b/util/system/mlock.h
index f021c0fe67..41a9e4457e 100644
--- a/util/system/mlock.h
+++ b/util/system/mlock.h
@@ -23,8 +23,8 @@ enum ELockAllMemoryFlag {
     /** Since Linux 4.4, with LockCurrentMemory or LockFutureMemory or both, lock only pages that are or once they are present in memory. */
     LockMemoryOnFault = 4,
 };
-Y_DECLARE_FLAGS(ELockAllMemoryFlags, ELockAllMemoryFlag)
-Y_DECLARE_OPERATORS_FOR_FLAGS(ELockAllMemoryFlags)
+Y_DECLARE_FLAGS(ELockAllMemoryFlags, ELockAllMemoryFlag);
+Y_DECLARE_OPERATORS_FOR_FLAGS(ELockAllMemoryFlags);
 
 /**
  * Performs provided locking operation.
diff --git a/util/system/protect.h b/util/system/protect.h
index 26714f3e92..16859a2cc4 100644
--- a/util/system/protect.h
+++ b/util/system/protect.h
@@ -11,8 +11,8 @@ enum EProtectMemoryMode {
     PM_EXEC = 0x04   // execute access allowed
 };
 
-Y_DECLARE_FLAGS(EProtectMemory, EProtectMemoryMode)
-Y_DECLARE_OPERATORS_FOR_FLAGS(EProtectMemory)
+Y_DECLARE_FLAGS(EProtectMemory, EProtectMemoryMode);
+Y_DECLARE_OPERATORS_FOR_FLAGS(EProtectMemory);
 
 /**
  * Set protection mode on memory block
diff --git a/ydb/core/blob_depot/data.h b/ydb/core/blob_depot/data.h
index 463b6979c7..9c60f20502 100644
--- a/ydb/core/blob_depot/data.h
+++ b/ydb/core/blob_depot/data.h
@@ -370,7 +370,7 @@ namespace NKikimr::NBlobDepot {
             REVERSE = 4,
         };
 
-        Y_DECLARE_FLAGS(TScanFlags, EScanFlags)
+        Y_DECLARE_FLAGS(TScanFlags, EScanFlags);
 
         struct TScanRange {
             TKey Begin;
@@ -719,7 +719,7 @@ namespace NKikimr::NBlobDepot {
         void ExecuteConfirmGC(ui8 channel, ui32 groupId, std::vector<TLogoBlobID> trashDeleted, TGenStep confirmedGenStep);
     };
 
-    Y_DECLARE_OPERATORS_FOR_FLAGS(TBlobDepot::TData::TScanFlags)
+    Y_DECLARE_OPERATORS_FOR_FLAGS(TBlobDepot::TData::TScanFlags);
 
 } // NKikimr::NBlobDepot
 
diff --git a/ydb/core/kqp/provider/yql_kikimr_opt_build.cpp b/ydb/core/kqp/provider/yql_kikimr_opt_build.cpp
index 8c0d6a0dc1..2d3ca7e9be 100644
--- a/ydb/core/kqp/provider/yql_kikimr_opt_build.cpp
+++ b/ydb/core/kqp/provider/yql_kikimr_opt_build.cpp
@@ -70,8 +70,8 @@ enum class TPrimitiveYdbOperation : ui32 {
     Write = 1 << 1
 };
 
-Y_DECLARE_FLAGS(TPrimitiveYdbOperations, TPrimitiveYdbOperation)
-Y_DECLARE_OPERATORS_FOR_FLAGS(TPrimitiveYdbOperations)
+Y_DECLARE_FLAGS(TPrimitiveYdbOperations, TPrimitiveYdbOperation);
+Y_DECLARE_OPERATORS_FOR_FLAGS(TPrimitiveYdbOperations);
 
 struct TKiExploreTxResults {
     struct TKiQueryBlock {
diff --git a/ydb/core/kqp/provider/yql_kikimr_provider.h b/ydb/core/kqp/provider/yql_kikimr_provider.h
index 689e8c4c90..488813c6e9 100644
--- a/ydb/core/kqp/provider/yql_kikimr_provider.h
+++ b/ydb/core/kqp/provider/yql_kikimr_provider.h
@@ -228,8 +228,8 @@ enum class TYdbOperation : ui32 {
     ModifyPermission     = 1 << 22
 };
 
-Y_DECLARE_FLAGS(TYdbOperations, TYdbOperation)
-Y_DECLARE_OPERATORS_FOR_FLAGS(TYdbOperations)
+Y_DECLARE_FLAGS(TYdbOperations, TYdbOperation);
+Y_DECLARE_OPERATORS_FOR_FLAGS(TYdbOperations);
 
 const TYdbOperations& KikimrSchemeOps();
 const TYdbOperations& KikimrDataOps();