SourceFormat Enforcement

[thirdparty/squid.git] / src / HttpHdrCc.cci

diff --git a/src/HttpHdrCc.cci b/src/HttpHdrCc.cci
index b4bdd5b7524a51a96afa7915400a64603e5fe7ec..cdbc1016f0d60bd90855f95cb127ca78fad160dd 100644 (file)
--- a/src/HttpHdrCc.cci
+++ b/src/HttpHdrCc.cci
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2017 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -12,25 +12,25 @@
 #include "defines.h"
 
 bool
-HttpHdrCc::isSet(http_hdr_cc_type id) const
+HttpHdrCc::isSet(HttpHdrCcType id) const
 {
-    assert(id>=CC_PUBLIC && id < CC_ENUM_END);
-    return EBIT_TEST(mask,id);
+    assert(id < HttpHdrCcType::CC_ENUM_END);
+    return EBIT_TEST(mask, static_cast<long>(id));
 }
 
 void
-HttpHdrCc::setMask(http_hdr_cc_type id, bool newval)
+HttpHdrCc::setMask(HttpHdrCcType id, bool newval)
 {
     if (newval)
-        EBIT_SET(mask,id);
+        EBIT_SET(mask,static_cast<long>(id));
     else
-        EBIT_CLR(mask,id);
+        EBIT_CLR(mask, static_cast<long>(id));
 }
 
 /// set a data member to a new value, and set the corresponding mask-bit.
 /// if setting is false, then the mask-bit is cleared.
 void
-HttpHdrCc::setValue(int32_t &value, int32_t new_value, http_hdr_cc_type hdr, bool setting)
+HttpHdrCc::setValue(int32_t &value, int32_t new_value, HttpHdrCcType hdr, bool setting)
 {
     if (setting) {
         if (new_value < 0) {
@@ -45,3 +45,4 @@ HttpHdrCc::setValue(int32_t &value, int32_t new_value, http_hdr_cc_type hdr, boo
     value=new_value;
     setMask(hdr,setting);
 }
+