remove macros clash with absl libraries

3 files changed, 14 insertions, 20 deletions

diff --git a/library/cpp/actors/core/log.cpp b/library/cpp/actors/core/log.cpp
index 5f63b5af58..d005be6535 100644
--- a/library/cpp/actors/core/log.cpp
+++ b/library/cpp/actors/core/log.cpp
@@ -77,7 +77,7 @@ namespace NActors {
             HTML(str) {
                 DIV_CLASS("row") {
                     DIV_CLASS("col-md-12") {
-                        H4() {
+                        TAG(TH4) {
                             str << "Counters" << Endl;
                         }
                         DynamicCounters->OutputHtml(str);
@@ -142,7 +142,7 @@ namespace NActors {
             HTML(str) {
                 DIV_CLASS("row") {
                     DIV_CLASS("col-md-12") {
-                        H4() {
+                        TAG(TH4) {
                             str << "Metrics" << Endl;
                         }
                         // TODO: Now, TMetricRegistry does not have the GetOutputHtml function
@@ -312,7 +312,7 @@ namespace NActors {
     void TLoggerActor::RenderComponentPriorities(IOutputStream& str) {
         using namespace NLog;
         HTML(str) {
-            H4() {
+            TAG(TH4) {
                 str << "Priority Settings for the Components";
             }
             TABLE_SORTABLE_CLASS("table") {
@@ -415,7 +415,7 @@ namespace NActors {
             HTML(str) {
                 DIV_CLASS("row") {
                     DIV_CLASS("col-md-12") {
-                        H4() {
+                        TAG(TH4) {
                             str << "Current log settings for " << Settings->ComponentName(component) << Endl;
                         }
                         UL() {
@@ -437,7 +437,7 @@ namespace NActors {
 
                 DIV_CLASS("row") {
                     DIV_CLASS("col-md-12") {
-                        H4() {
+                        TAG(TH4) {
                             str << "Change priority" << Endl;
                         }
                         UL() {
@@ -448,7 +448,7 @@ namespace NActors {
                                 }
                             }
                         }
-                        H4() {
+                        TAG(TH4) {
                             str << "Change sampling priority" << Endl;
                         }
                         UL() {
@@ -459,7 +459,7 @@ namespace NActors {
                                 }
                             }
                         }
-                        H4() {
+                        TAG(TH4) {
                             str << "Change sampling rate" << Endl;
                         }
                         str << "<form method=\"GET\">" << Endl;
@@ -467,7 +467,7 @@ namespace NActors {
                         str << "<input type=\"hidden\" name=\"c\" value=\"" << component << "\">" << Endl;
                         str << "<input class=\"btn btn-primary\" type=\"submit\" value=\"Change\"/>" << Endl;
                         str << "</form>" << Endl;
-                        H4() {
+                        TAG(TH4) {
                             str << "<a href='logger'>Cancel</a>" << Endl;
                         }
                     }
@@ -503,7 +503,7 @@ namespace NActors {
                         RenderComponentPriorities(str);
                     }
                     DIV_CLASS("col-md-6") {
-                        H4() {
+                        TAG(TH4) {
                             str << "Change priority for all components";
                         }
                         TABLE_CLASS("table table-condensed") {
@@ -525,7 +525,7 @@ namespace NActors {
                                 }
                             }
                         }
-                        H4() {
+                        TAG(TH4) {
                             str << "Change sampling priority for all components";
                         }
                         TABLE_CLASS("table table-condensed") {
@@ -547,7 +547,7 @@ namespace NActors {
                                 }
                             }
                         }
-                        H4() {
+                        TAG(TH4) {
                             str << "Change sampling rate for all components";
                         }
                         str << "<form method=\"GET\">" << Endl;
@@ -555,7 +555,7 @@ namespace NActors {
                         str << "<input type=\"hidden\" name=\"c\" value=\"-1\">" << Endl;
                         str << "<input class=\"btn btn-primary\" type=\"submit\" value=\"Change\"/>" << Endl;
                         str << "</form>" << Endl;
-                        H4() {
+                        TAG(TH4) {
                             str << "Drop log entries in case of overflow: "
                                 << (Settings->AllowDrop ? "Enabled" : "Disabled");
                         }
diff --git a/library/cpp/monlib/dynamic_counters/page.cpp b/library/cpp/monlib/dynamic_counters/page.cpp
index f80cc5ea04..f2fdd61710 100644
--- a/library/cpp/monlib/dynamic_counters/page.cpp
+++ b/library/cpp/monlib/dynamic_counters/page.cpp
@@ -123,7 +123,7 @@ void TDynamicCountersPage::BeforePre(IMonHttpRequest& request) {
             out << " for Solomon";
         }
 
-        H5() {
+        TAG(TH5) {
             out << "Counters subgroups";
         }
         UL() {
@@ -136,7 +136,7 @@ void TDynamicCountersPage::BeforePre(IMonHttpRequest& request) {
             });
         }
 
-        H4() {
+        TAG(TH4) {
             out << "Counters as text";
         }
     }
diff --git a/library/cpp/monlib/service/pages/templates.h b/library/cpp/monlib/service/pages/templates.h
index 0249807d5f..ab1d91c54e 100644
--- a/library/cpp/monlib/service/pages/templates.h
+++ b/library/cpp/monlib/service/pages/templates.h
@@ -55,17 +55,11 @@
 #define PARA() TAG(TPara)
 #define PARA_CLASS(cls) TAG_CLASS(TPara, cls)
 
-#define H1() TAG(TH1)
 #define H1_CLASS(cls) TAG_CLASS(TH1, cls)
-#define H2() TAG(TH2)
 #define H2_CLASS(cls) TAG_CLASS(TH2, cls)
-#define H3() TAG(TH3)
 #define H3_CLASS(cls) TAG_CLASS(TH3, cls)
-#define H4() TAG(TH4)
 #define H4_CLASS(cls) TAG_CLASS(TH4, cls)
-#define H5() TAG(TH5)
 #define H5_CLASS(cls) TAG_CLASS(TH5, cls)
-#define H6() TAG(TH6)
 #define H6_CLASS(cls) TAG_CLASS(TH6, cls)
 
 #define SMALL() TAG(TSMALL)