diff options
author | Brian Smith <brian@briansmith.org> | 2016-03-16 07:10:00 +0100 |
---|---|---|
committer | Brian Smith <brian@briansmith.org> | 2016-03-16 07:10:00 +0100 |
commit | 45ba676c75d4d9ba8f8a93d913a06366a1501e7f (patch) | |
tree | b695bc94da5da46505c238c832029d7779999211 | |
parent | 8e09eaf5dfbe4099e60014dd91683fd379b79fd3 (diff) | |
download | nss-hg-45ba676c75d4d9ba8f8a93d913a06366a1501e7f.tar.gz |
Bug 1189020 - Replace |// unnamed namespace| with |// namespace| in mozilla::pkix. r=Cykesiopka
This is what Google suggests in its style guide, and somebody
already changed one of these comments to the new style.
-rw-r--r-- | lib/mozpkix/lib/pkixder.cpp | 2 | ||||
-rw-r--r-- | lib/mozpkix/lib/pkixnames.cpp | 8 | ||||
-rw-r--r-- | lib/mozpkix/lib/pkixnss.cpp | 2 | ||||
-rw-r--r-- | lib/mozpkix/lib/pkixocsp.cpp | 2 | ||||
-rw-r--r-- | lib/mozpkix/test/gtest/pkixder_input_tests.cpp | 2 | ||||
-rw-r--r-- | lib/mozpkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp | 2 | ||||
-rw-r--r-- | lib/mozpkix/test/lib/pkixtestalg.cpp | 2 | ||||
-rw-r--r-- | lib/mozpkix/test/lib/pkixtestnss.cpp | 4 | ||||
-rw-r--r-- | lib/mozpkix/test/lib/pkixtestutil.cpp | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/lib/mozpkix/lib/pkixder.cpp b/lib/mozpkix/lib/pkixder.cpp index a87ba9987..4b9047da0 100644 --- a/lib/mozpkix/lib/pkixder.cpp +++ b/lib/mozpkix/lib/pkixder.cpp @@ -104,7 +104,7 @@ AlgorithmIdentifierValue(Reader& input, /*out*/ Reader& algorithmOIDValue) return OptionalNull(input); } -} // unnamed namespace +} // namespace Result SignatureAlgorithmIdentifierValue(Reader& input, diff --git a/lib/mozpkix/lib/pkixnames.cpp b/lib/mozpkix/lib/pkixnames.cpp index 37c6c79cb..01e365173 100644 --- a/lib/mozpkix/lib/pkixnames.cpp +++ b/lib/mozpkix/lib/pkixnames.cpp @@ -195,7 +195,7 @@ Result MatchPresentedRFC822NameWithReferenceRFC822Name( Input presentedRFC822Name, IDRole referenceRFC822NameRole, Input referenceRFC822Name, /*out*/ bool& matches); -} // unnamed namespace +} // namespace bool IsValidReferenceDNSID(Input hostname); bool IsValidPresentedDNSID(Input hostname); @@ -1650,7 +1650,7 @@ ReadIPv4AddressComponent(Reader& input, bool lastComponent, return true; } -} // unnamed namespace +} // namespace // On Windows and maybe other platforms, OS-provided IP address parsing // functions might fail if the protocol (IPv4 or IPv6) has been disabled, so we @@ -1706,7 +1706,7 @@ FinishIPv6Address(/*in/out*/ uint8_t (&address)[16], int numComponents, return true; } -} // unnamed namespace +} // namespace // On Windows and maybe other platforms, OS-provided IP address parsing // functions might fail if the protocol (IPv4 or IPv6) has been disabled, so we @@ -2034,6 +2034,6 @@ IsValidDNSID(Input hostname, IDRole idRole, AllowWildcards allowWildcards) return true; } -} // unnamed namespace +} // namespace } } // namespace mozilla::pkix diff --git a/lib/mozpkix/lib/pkixnss.cpp b/lib/mozpkix/lib/pkixnss.cpp index c12286248..b86d57e8f 100644 --- a/lib/mozpkix/lib/pkixnss.cpp +++ b/lib/mozpkix/lib/pkixnss.cpp @@ -79,7 +79,7 @@ VerifySignedDigest(const SignedDigest& sd, return Success; } -} // unnamed namespace +} // namespace Result VerifyRSAPKCS1SignedDigestNSS(const SignedDigest& sd, diff --git a/lib/mozpkix/lib/pkixocsp.cpp b/lib/mozpkix/lib/pkixocsp.cpp index b5b165f83..565478fe2 100644 --- a/lib/mozpkix/lib/pkixocsp.cpp +++ b/lib/mozpkix/lib/pkixocsp.cpp @@ -32,7 +32,7 @@ namespace { const size_t SHA1_DIGEST_LENGTH = 160 / 8; -} // unnamed namespace +} // namespace namespace mozilla { namespace pkix { diff --git a/lib/mozpkix/test/gtest/pkixder_input_tests.cpp b/lib/mozpkix/test/gtest/pkixder_input_tests.cpp index adfefb4af..b0a6c8bf0 100644 --- a/lib/mozpkix/test/gtest/pkixder_input_tests.cpp +++ b/lib/mozpkix/test/gtest/pkixder_input_tests.cpp @@ -917,4 +917,4 @@ TEST_F(pkixder_input_tests, MatchRest2Mismatch) ASSERT_TRUE(input.MatchRest(der)); } -} // unnamed namespace +} // namespace diff --git a/lib/mozpkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp b/lib/mozpkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp index 06a8611fc..308fad008 100644 --- a/lib/mozpkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp +++ b/lib/mozpkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp @@ -48,7 +48,7 @@ public: namespace { char const* const rootName = "Test CA 1"; void deleteCertID(CertID* certID) { delete certID; } -} // unnamed namespace +} // namespace class pkixocsp_VerifyEncodedResponse : public ::testing::Test { diff --git a/lib/mozpkix/test/lib/pkixtestalg.cpp b/lib/mozpkix/test/lib/pkixtestalg.cpp index 6a766b418..a19fd26f3 100644 --- a/lib/mozpkix/test/lib/pkixtestalg.cpp +++ b/lib/mozpkix/test/lib/pkixtestalg.cpp @@ -134,7 +134,7 @@ static const uint8_t DSS_G_RAW[] = 0x62,0xF6,0x35,0x76, }; -} // unnamed namespace +} // namespace TestSignatureAlgorithm::TestSignatureAlgorithm( const TestPublicKeyAlgorithm& publicKeyAlg, diff --git a/lib/mozpkix/test/lib/pkixtestnss.cpp b/lib/mozpkix/test/lib/pkixtestnss.cpp index f946b5baf..4d49b9e31 100644 --- a/lib/mozpkix/test/lib/pkixtestnss.cpp +++ b/lib/mozpkix/test/lib/pkixtestnss.cpp @@ -148,7 +148,7 @@ private: ScopedSECKEYPrivateKey privateKey; }; -} // unnamed namespace +} // namespace // This private function is also used by Gecko's PSM test framework // (OCSPCommon.cpp). @@ -216,7 +216,7 @@ GenerateKeyPairInner() abort(); } -} // unnamed namespace +} // namespace TestKeyPair* GenerateKeyPair() diff --git a/lib/mozpkix/test/lib/pkixtestutil.cpp b/lib/mozpkix/test/lib/pkixtestutil.cpp index 3183bcfc4..7fd94192d 100644 --- a/lib/mozpkix/test/lib/pkixtestutil.cpp +++ b/lib/mozpkix/test/lib/pkixtestutil.cpp @@ -69,7 +69,7 @@ OpenFile(const string& dir, const string& filename, const string& mode) return file.release(); } -} // unnamed namespace +} // namespace bool InputEqualsByteString(Input input, const ByteString& bs) |