Cleanup namespace ending comment

(This is a merge of http://go/wvgerrit/13400 from the Widevine CDM
repository.)

Replace "};  // namespace" with "}  // namespace":
ag -l --ignore-dir third_party "};  //" | \
while read f; do sed -r -i 's/\};  \/\//}  \/\//' $f ; done

Replace "// unnamed namespace" with "// namespace":
ag -l --ignore-dir third_party "unnamed namespace" | \
while read f; do sed -r -i 's/unnamed namespace/namespace/' $f ; done

Change-Id: I50ece9a127ce669f15cd532dfae1dd741338a075
This commit is contained in:
KongQun Yang
2015-03-09 12:59:16 -07:00
committed by John "Juce" Bruce
parent 23c95a1251
commit 0a564039ca
24 changed files with 24 additions and 25 deletions

View File

@@ -19,6 +19,6 @@ class Clock {
virtual int64_t GetCurrentTime();
};
}; // namespace wvcdm
} // namespace wvcdm
#endif // WVCDM_CORE_CLOCK_H_

View File

@@ -35,6 +35,6 @@ class CryptoKey {
std::string key_control_iv_;
};
}; // namespace wvcdm
} // namespace wvcdm
#endif // WVCDM_CORE_CRYPTO_KEY_H_

View File

@@ -138,6 +138,6 @@ class CryptoSession {
CORE_DISALLOW_COPY_AND_ASSIGN(CryptoSession);
};
}; // namespace wvcdm
} // namespace wvcdm
#endif // WVCDM_CORE_CRYPTO_SESSSION_H_

View File

@@ -50,6 +50,6 @@ class AutoLock {
CORE_DISALLOW_COPY_AND_ASSIGN(AutoLock);
};
}; // namespace wvcdm
} // namespace wvcdm
#endif // WVCDM_CORE_LOCK_H_

View File

@@ -34,6 +34,6 @@ void Log(const char* file, int line, LogPriority level, const char* fmt, ...);
#define LOGD(...) Log(__FILE__, __LINE__, wvcdm::LOG_DEBUG, __VA_ARGS__)
#define LOGV(...) Log(__FILE__, __LINE__, wvcdm::LOG_VERBOSE, __VA_ARGS__)
}; // namespace wvcdm
} // namespace wvcdm
#endif // WVCDM_CORE_LOG_H_

View File

@@ -60,6 +60,6 @@ class scoped_ptr {
CORE_DISALLOW_COPY_AND_ASSIGN(scoped_ptr);
};
}; // namespace wvcdm
} // namespace wvcdm
#endif // WVCDM_CORE_SCOPED_PTR_H_

View File

@@ -24,6 +24,6 @@ std::string UintToString(unsigned int value);
int64_t htonll64(int64_t x);
int64_t ntohll64(int64_t x);
}; // namespace wvcdm
} // namespace wvcdm
#endif // WVCDM_CORE_STRING_CONVERSIONS_H_

View File

@@ -46,6 +46,6 @@ class Timer {
CORE_DISALLOW_COPY_AND_ASSIGN(Timer);
};
}; // namespace wvcdm
} // namespace wvcdm
#endif // WVCDM_CORE_TIMER_H_

View File

@@ -21,7 +21,7 @@
namespace {
const uint32_t kUpdateUsageInformationPeriod = 60; // seconds
const size_t kUsageReportsPerRequest = 1;
} // unnamed namespace
} // namespace
namespace wvcdm {

View File

@@ -1004,4 +1004,4 @@ bool CryptoSession::GetMaxNumberOfSessions(size_t* max) {
return true;
}
}; // namespace wvcdm
} // namespace wvcdm

View File

@@ -55,7 +55,7 @@ bool Hash(const std::string& data, std::string* hash) {
return true;
}
} // unnamed namespace
} // namespace
namespace wvcdm {

View File

@@ -503,7 +503,7 @@ bool OEMCrypto_SupportsUsageTable(SecurityLevel level) {
return fcn->SupportsUsageTable();
}
}; // namespace wvcdm
} // namespace wvcdm
extern "C" OEMCryptoResult OEMCrypto_Initialize(void) {
if (kAdapter) {

View File

@@ -202,4 +202,4 @@ int64_t ntohll64(int64_t x) { // Convert from big endian (network-byte-order)
}
}
}; // namespace wvcdm
} // namespace wvcdm

View File

@@ -50,7 +50,7 @@ const std::pair<const std::string*, const std::string*> kBase64TestVectors[] = {
make_pair(&kTwoBytesOverData, &kTwoBytesOverB64Data),
make_pair(&kTestData, &kB64TestData)};
} // unnamed namespace
} // namespace
namespace wvcdm {

View File

@@ -59,6 +59,6 @@ class ConfigTestEnv {
CORE_DISALLOW_COPY_AND_ASSIGN(ConfigTestEnv);
};
}; // namespace wvcdm
} // namespace wvcdm
#endif // CDM_TEST_CONFIG_TEST_ENV_H_

View File

@@ -51,6 +51,6 @@ class HttpSocket {
CORE_DISALLOW_COPY_AND_ASSIGN(HttpSocket);
};
}; // namespace wvcdm
} // namespace wvcdm
#endif // CDM_TEST_HTTP_SOCKET_H_

View File

@@ -25,6 +25,6 @@ class LicenseRequest {
CORE_DISALLOW_COPY_AND_ASSIGN(LicenseRequest);
};
}; // namespace wvcdm
} // namespace wvcdm
#endif // CDM_TEST_LICENSE_REQUEST_H_

View File

@@ -40,7 +40,7 @@ int64_t GetLicenseRenewalDelay(int64_t license_duration) {
? license_duration - kLicenseRenewalPeriod
: 0;
}
} // unnamed namespace
} // namespace
namespace wvcdm {

View File

@@ -90,4 +90,4 @@ void PrintTo(const enum CdmCertificateType& value, ::std::ostream* os) {
}
};
}; // namespace wvcdm
} // namespace wvcdm

View File

@@ -14,6 +14,6 @@ void PrintTo(const enum CdmEventType& value, ::std::ostream* os);
void PrintTo(const enum CdmLicenseType& value, ::std::ostream* os);
void PrintTo(const enum CdmSecurityLevel& value, ::std::ostream* os);
void PrintTo(const enum CdmCertificateType& value, ::std::ostream* os);
}; // namespace wvcdm
} // namespace wvcdm
#endif // CDM_TEST_PRINTERS_H_

View File

@@ -34,6 +34,6 @@ class UrlRequest {
CORE_DISALLOW_COPY_AND_ASSIGN(UrlRequest);
};
}; // namespace wvcdm
} // namespace wvcdm
#endif // CDM_TEST_URL_REQUEST_H_

View File

@@ -15,5 +15,4 @@ int64_t Clock::GetCurrentTime() {
return tv.tv_sec;
}
}; // namespace wvcdm
} // namespace wvcdm

View File

@@ -31,6 +31,6 @@ bool Lock::Try() {
return (impl_->lock_.tryLock() == 0);
}
}; // namespace wvcdm
} // namespace wvcdm

View File

@@ -52,4 +52,4 @@ void Log(const char* file, int line, LogPriority level, const char* fmt, ...) {
__android_log_write(prio, LOG_TAG, buf);
}
}; // namespace wvcdm
} // namespace wvcdm