From: Amos Jeffries Date: Sat, 27 Nov 2010 01:58:38 +0000 (-0700) Subject: Remove useless namespace semi-colons X-Git-Tag: take1~60 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e55192127bceafd06baf142d525217ad2a81895f;p=thirdparty%2Fsquid.git Remove useless namespace semi-colons --- diff --git a/src/SquidMath.h b/src/SquidMath.h index a8fc22abb9..a6061a62b2 100644 --- a/src/SquidMath.h +++ b/src/SquidMath.h @@ -10,6 +10,6 @@ extern double doublePercent(const double, const double); extern int intAverage(const int, const int, int, const int); extern double doubleAverage(const double, const double, int, const int); -}; // namespace Math +} // namespace Math #endif /* _SQUID_SRC_SQUIDMATH_H */ diff --git a/src/auth/Config.h b/src/auth/Config.h index 26ecdbfe01..fa4994ea4c 100644 --- a/src/auth/Config.h +++ b/src/auth/Config.h @@ -140,6 +140,6 @@ typedef Vector authConfig; extern authConfig TheConfig; -}; // namespace Auth +} // namespace Auth #endif /* SQUID_AUTHCONFIG_H */ diff --git a/src/comm/IoCallback.h b/src/comm/IoCallback.h index 1cf423e9f5..fc404460ef 100644 --- a/src/comm/IoCallback.h +++ b/src/comm/IoCallback.h @@ -65,6 +65,6 @@ extern void CallbackTableDestruct(); #define COMMIO_FD_READCB(fd) (&Comm::iocb_table[(fd)].readcb) #define COMMIO_FD_WRITECB(fd) (&Comm::iocb_table[(fd)].writecb) -}; // namespace Comm +} // namespace Comm #endif /* _SQUID_COMM_IOCALLBACK_H */ diff --git a/src/comm/ListenStateData.h b/src/comm/ListenStateData.h index d49e317d13..b5b5872f78 100644 --- a/src/comm/ListenStateData.h +++ b/src/comm/ListenStateData.h @@ -49,6 +49,6 @@ private: void setListen(); }; -}; // namespace Comm +} // namespace Comm #endif /* SQUID_LISTENERSTATEDATA_H */ diff --git a/src/comm/Write.h b/src/comm/Write.h index 420b7601f1..1d5dcdff92 100644 --- a/src/comm/Write.h +++ b/src/comm/Write.h @@ -25,6 +25,6 @@ void WriteCancel(int fd, const char *reason); // callback handler to process an FD which is available for writing. extern PF HandleWrite; -}; // namespace Comm +} // namespace Comm #endif /* _SQUID_COMM_IOWRITE_H */ diff --git a/src/esi/Module.h b/src/esi/Module.h index c39db10de3..fb2069ff0b 100644 --- a/src/esi/Module.h +++ b/src/esi/Module.h @@ -7,6 +7,6 @@ namespace Esi extern void Init(); extern void Clean(); -}; // namespace Esi +} // namespace Esi #endif /* SQUID_ESI_MODULE_H */ diff --git a/src/eui/Config.h b/src/eui/Config.h index 05d4f7afe4..ffd7cde0ff 100644 --- a/src/eui/Config.h +++ b/src/eui/Config.h @@ -12,6 +12,6 @@ public: extern EuiConfig TheConfig; -}; // namespace Eui +} // namespace Eui #endif /* SQUID_EUI_CONFIG_H */ diff --git a/src/eui/Eui48.h b/src/eui/Eui48.h index b0101a150c..40b70137f7 100644 --- a/src/eui/Eui48.h +++ b/src/eui/Eui48.h @@ -70,7 +70,7 @@ private: unsigned char eui[SZ_EUI48_BUF]; }; -}; // namespace Eui +} // namespace Eui #endif /* USE_SQUID_EUI */ #endif /* _SQUID_EUI_EUI48_H */ diff --git a/src/eui/Eui64.h b/src/eui/Eui64.h index 7669684505..42e6db73f0 100644 --- a/src/eui/Eui64.h +++ b/src/eui/Eui64.h @@ -6,7 +6,7 @@ namespace Ip { class Address; -}; +} #if HAVE_CSTRING #include @@ -83,7 +83,7 @@ private: unsigned char eui[SZ_EUI64_BUF]; }; -}; // namespace Eui +} // namespace Eui #endif /* USE_SQUID_EUI */ #endif /* _SQUID_EUI_EUI64_H */ diff --git a/src/fs/Module.h b/src/fs/Module.h index d0f0077904..9d7ab5db1c 100644 --- a/src/fs/Module.h +++ b/src/fs/Module.h @@ -7,6 +7,6 @@ namespace Fs extern void Init(); extern void Clean(); -}; // namespace Fs +} // namespace Fs #endif /* SQUID_FS_MODULE_H */ diff --git a/src/ident/Config.h b/src/ident/Config.h index b9a1cc0170..899e601c6b 100644 --- a/src/ident/Config.h +++ b/src/ident/Config.h @@ -17,7 +17,7 @@ public: extern IdentConfig TheConfig; -}; // namespace Ident +} // namespace Ident #endif /* USE_IDENT */ #endif /* SQUID_IDENT_CONFIG_H */ diff --git a/src/ident/Ident.cc b/src/ident/Ident.cc index 1f9292c748..a6c34699a5 100644 --- a/src/ident/Ident.cc +++ b/src/ident/Ident.cc @@ -74,7 +74,7 @@ static hash_table *ident_hash = NULL; static void ClientAdd(IdentStateData * state, IDCB * callback, void *callback_data); static void identCallback(IdentStateData * state, char *result); -}; // namespace Ident +} // namespace Ident Ident::IdentConfig Ident::TheConfig; diff --git a/src/ip/Address.h b/src/ip/Address.h index a1365ca1ec..55254522c6 100644 --- a/src/ip/Address.h +++ b/src/ip/Address.h @@ -405,7 +405,7 @@ public: Address_list *next; }; -}; // namespace Ip +} // namespace Ip extern void parse_IpAddress_list_token(Ip::Address_list **, char *); diff --git a/src/ip/Intercept.h b/src/ip/Intercept.h index 338255a153..0a4e3ff566 100644 --- a/src/ip/Intercept.h +++ b/src/ip/Intercept.h @@ -181,6 +181,6 @@ private: */ extern Intercept Interceptor; -}; // namespace Ip +} // namespace Ip #endif /* SQUID_IP_IPINTERCEPT_H */ diff --git a/src/ip/QosConfig.h b/src/ip/QosConfig.h index 1936474635..857fafed44 100644 --- a/src/ip/QosConfig.h +++ b/src/ip/QosConfig.h @@ -187,9 +187,9 @@ extern Config TheConfig; storeAppendPrintf(e, "%s", temp); \ } while(0); -}; // namespace Qos +} // namespace Qos -}; // namespace Ip +} // namespace Ip #if _USE_INLINE_ #include "Qos.cci" diff --git a/src/ip/tools.h b/src/ip/tools.h index 5b9831a488..5555879e0a 100644 --- a/src/ip/tools.h +++ b/src/ip/tools.h @@ -16,6 +16,6 @@ extern void ProbeTransport(void); /// Whether IPv6 is supported and type of support. extern int EnableIpv6; -}; // namespace Ip +} // namespace Ip #endif /* _SQUID_SRC_IP_TOOLS_H */ diff --git a/src/ipc/StrandCoords.h b/src/ipc/StrandCoords.h index 1a6ea21f54..899bd62510 100644 --- a/src/ipc/StrandCoords.h +++ b/src/ipc/StrandCoords.h @@ -15,6 +15,6 @@ namespace Ipc /// a collection of strand coordinates; the order, if any, is owner-dependent typedef std::vector StrandCoords; -}; // namespace Ipc +} // namespace Ipc #endif /* SQUID_IPC_STRAND_COORDS_H */ diff --git a/src/log/Config.h b/src/log/Config.h index c46c91feb8..4a74a26568 100644 --- a/src/log/Config.h +++ b/src/log/Config.h @@ -12,6 +12,6 @@ public: extern LogConfig TheConfig; -}; // namespace Log +} // namespace Log #endif