Skip to content

Commit

Permalink
Adopt commit 2df0f8e from master: Merge pull request #796 from sbreit…
Browse files Browse the repository at this point in the history
…st/fix_namespace_layout-drqs-8631397

commit 2df0f8e
Merge: 67916d3 872d5f5
Author: mgiroux <mgiroux@bloomberg.net>
Date:   Sat Oct 15 09:53:04 2016 -0400

    Merge pull request #796 from sbreitst/fix_namespace_layout-drqs-8631397

    drqs-8631397: Standardize 'namespace' opening layout.

commit 872d5f5
Author: Steven Breitstein <sbreitstein@bloomberg.net>
Date:   Fri Oct 14 19:54:51 2016 -0400

    drqs-8631397: Standardize 'namespace' opening layout.
  • Loading branch information
sbreitstein authored and abeels committed Oct 27, 2016
1 parent 1a7b609 commit b694440
Show file tree
Hide file tree
Showing 67 changed files with 117 additions and 148 deletions.
4 changes: 2 additions & 2 deletions groups/bal/ball/ball_attributecontainer.h
Expand Up @@ -327,9 +327,9 @@ BSLS_IDENT("$Id: $")


namespace BloombergLP {
namespace ball {


namespace ball {class Attribute;
class Attribute;

// ========================
// class AttributeContainer
Expand Down
7 changes: 3 additions & 4 deletions groups/bal/ball/ball_attributecontainerlist.h
Expand Up @@ -121,11 +121,10 @@ BSLS_IDENT("$Id: $")
#endif

namespace BloombergLP {
namespace ball {


namespace ball {class Attribute;
class AttributeContainer;

class Attribute;
class AttributeContainer;
struct AttributeContainerList_Node;

// ====================================
Expand Down
4 changes: 2 additions & 2 deletions groups/bal/ball/ball_attributecontext.h
Expand Up @@ -310,9 +310,9 @@ BSLS_IDENT("$Id: $")
#endif

namespace BloombergLP {
namespace ball {


namespace ball {class Category;
class Category;
class CategoryManager;

// ===============================================
Expand Down
5 changes: 2 additions & 3 deletions groups/bal/balm/balm_collectorrepository.h
Expand Up @@ -156,10 +156,9 @@ BSLS_IDENT("$Id: $")
#endif

namespace BloombergLP {
namespace balm {


namespace balm {class Category;

class Category;
class CollectorRepository_MetricCollectors; // defined in implementation

// =========================
Expand Down
4 changes: 2 additions & 2 deletions groups/bal/balm/balm_configurationutil.h
Expand Up @@ -250,9 +250,9 @@ BSLS_IDENT("$Id: $")
#endif

namespace BloombergLP {
namespace balm {


namespace balm {class MetricFormat;
class MetricFormat;
class MetricFormatSpec;
class MetricsManager;

Expand Down
4 changes: 2 additions & 2 deletions groups/bal/balst/balst_assertionlogger.h
Expand Up @@ -139,8 +139,8 @@ BSLS_IDENT("$Id: $")
#endif

namespace BloombergLP {

namespace balst { // ============================
namespace balst {
// ============================
// struct AssertionLogger
// ============================

Expand Down
4 changes: 3 additions & 1 deletion groups/bal/balst/balst_stacktraceresolverimpl_dladdr.h
Expand Up @@ -81,7 +81,9 @@ namespace BloombergLP {
#if defined(BALST_OBJECTFILEFORMAT_RESOLVER_DLADDR)


namespace balst {template <typename RESOLVER_POLICY>
namespace balst {

template <typename RESOLVER_POLICY>
class StackTraceResolverImpl;

// ======================================================
Expand Down
4 changes: 3 additions & 1 deletion groups/bal/balst/balst_stacktraceresolverimpl_elf.h
Expand Up @@ -75,7 +75,9 @@ namespace BloombergLP {

#if defined(BALST_OBJECTFILEFORMAT_RESOLVER_ELF)

namespace balst {template <class RESOLVER_POLICY>
namespace balst {

template <class RESOLVER_POLICY>
class StackTraceResolverImpl;

// ===================================================
Expand Down
11 changes: 7 additions & 4 deletions groups/bal/balxml/balxml_decoder.h
Expand Up @@ -389,9 +389,9 @@ BSLS_IDENT("$Id: $")
#endif

namespace BloombergLP {
namespace balxml {


namespace balxml {class Reader;
class Reader;
class ErrorInfo;
class Decoder;

Expand Down Expand Up @@ -775,7 +775,9 @@ class Decoder_ErrorLogger {
// FORWARD DECLARATIONS


namespace balxml {class Decoder_ElementContext;
namespace balxml {

class Decoder_ElementContext;

template <class TYPE>
class Decoder_ChoiceContext;
Expand Down Expand Up @@ -876,8 +878,9 @@ class Decoder_ListParser {
// struct balxml::Decoder_InstantiateContext<TYPE>
// ===============================================

namespace balxml {

namespace balxml {template <class CATEGORY, class TYPE>
template <class CATEGORY, class TYPE>
struct Decoder_InstantiateContext;
// COMPONENT-PRIVATE CLASS. DO NOT USE OUTSIDE OF THIS COMPONENT.
//
Expand Down
6 changes: 3 additions & 3 deletions groups/bal/balxml/balxml_elementattribute.h
Expand Up @@ -232,9 +232,9 @@ BSLS_IDENT("$Id: $")
#endif

namespace BloombergLP {


namespace balxml {class PrefixStack;
namespace balxml {
class PrefixStack;

// ======================
// class ElementAttribute
Expand Down
4 changes: 2 additions & 2 deletions groups/bal/balxml/balxml_encoder.h
Expand Up @@ -213,9 +213,9 @@ BSLS_IDENT("$Id: $")
#endif

namespace BloombergLP {
namespace balxml {


namespace balxml {class Encoder_Context;
class Encoder_Context;

// =============
// class Encoder
Expand Down
3 changes: 2 additions & 1 deletion groups/bal/balxml/balxml_prefixstack.h
Expand Up @@ -104,8 +104,9 @@ BSLS_IDENT("$Id: $")
#endif

namespace BloombergLP {
namespace balxml {

namespace balxml {class NamespaceRegistry;
class NamespaceRegistry;

// =================
// class PrefixStack
Expand Down
4 changes: 2 additions & 2 deletions groups/bal/balxml/balxml_reader.h
Expand Up @@ -228,9 +228,9 @@ BSLS_IDENT("$Id: $")
#endif

namespace BloombergLP {
namespace balxml {


namespace balxml {class ElementAttribute;
class ElementAttribute;
class PrefixStack;

// ============
Expand Down
4 changes: 3 additions & 1 deletion groups/bbl/bbldc/bbldc_basicbasicdaycountadapter.h
Expand Up @@ -74,7 +74,9 @@ BSLS_IDENT("$Id: $")
#endif

namespace BloombergLP {
namespace bdlt { class Date; }

namespace bdlt { class Date; }

namespace bbldc {

// ===============================
Expand Down
3 changes: 2 additions & 1 deletion groups/bdl/bdlcc/bdlcc_objectcatalog.h
Expand Up @@ -320,8 +320,9 @@ BSLS_IDENT("$Id: $")
#endif

namespace BloombergLP {
namespace bdlcc {template <class TYPE> class ObjectCatalog_AutoCleanup;
namespace bdlcc {

template <class TYPE> class ObjectCatalog_AutoCleanup;
template <class TYPE> class ObjectCatalogIter;
template <class TYPE> class ObjectCatalog;

Expand Down
9 changes: 7 additions & 2 deletions groups/bdl/bdlcc/bdlcc_skiplist.h
Expand Up @@ -393,7 +393,10 @@ BSLS_IDENT("$Id: $")
#endif

namespace BloombergLP {
namespace bdlcc {template <class KEY, class DATA> class SkipList;
namespace bdlcc {

template <class KEY, class DATA>
class SkipList;

template <class KEY, class DATA>
bool operator==(const SkipList<KEY, DATA>& lhs,
Expand Down Expand Up @@ -518,7 +521,9 @@ class SkipList_RandomLevelGenerator {
// local class bdlcc::SkipList_PoolUtil
// ====================================

namespace bdlcc {class SkipList_PoolManager;
namespace bdlcc {

class SkipList_PoolManager;

struct SkipList_PoolUtil {
// This component-private utility handles the lock-free pool of list nodes.
Expand Down
11 changes: 6 additions & 5 deletions groups/bdl/bdlcc/bdlcc_timequeue.h
Expand Up @@ -659,8 +659,9 @@ BSLS_IDENT("$Id: $")
#endif

namespace BloombergLP {
namespace bdlcc {template <class DATA>
namespace bdlcc {

template <class DATA>
class TimeQueueItem;

// ===============
Expand Down Expand Up @@ -1794,8 +1795,8 @@ DATA& TimeQueueItem<DATA>::data()

#if 0

namespace bdlcc {// this definition was moved into the class declaration

namespace bdlcc {
// this definition was moved into the class declaration
// to work around a Visual Studio .NET 2003 bug.
template <typename DATA>
inline
Expand Down Expand Up @@ -1835,8 +1836,8 @@ const DATA& TimeQueueItem<DATA>::data() const

#if 0

namespace bdlcc {// this definition was moved into the class declaration

namespace bdlcc {
// this definition was moved into the class declaration
// to work around a Visual Studio .NET 2003 bug.
template <typename DATA>
inline
Expand Down
4 changes: 3 additions & 1 deletion groups/bdl/bdlf/bdlf_bind.h
Expand Up @@ -983,7 +983,9 @@ template <class A1, class A2, class A3, class A4, class A5, class A6, class A7,

} // close package namespace

namespace bdlf {struct Bind_Tuple0;
namespace bdlf {

struct Bind_Tuple0;
template <class A1>
struct Bind_Tuple1;
template <class A1, class A2>
Expand Down
3 changes: 1 addition & 2 deletions groups/bdl/bdlt/bdlt_dayofweekset.h
Expand Up @@ -909,8 +909,7 @@ void bdlt::hashAppend(HASHALG& hashAlg, const DayOfWeekSet& object)
}

// TRAITS SPECIALIZATIONS
namespace bslmf
{
namespace bslmf {
template <>
struct IsBitwiseMoveable<bdlt::DayOfWeekSet> : ::bsl::true_type {};
}
Expand Down
3 changes: 1 addition & 2 deletions groups/bsl/bsl+bslhdrs/bsl_c_stddef.h
Expand Up @@ -38,8 +38,7 @@ BSLS_IDENT("$Id: $")
extern "C++" {

// On Sun, 'std::size_t' is defined in 'stddef.h'.
namespace bsl
{
namespace bsl {
// Import selected symbols into bsl namespace
using native_std::size_t;
}
Expand Down
3 changes: 1 addition & 2 deletions groups/bsl/bsl+bslhdrs/bsl_cctype.h
Expand Up @@ -23,8 +23,7 @@ BSLS_IDENT("$Id: $")

#include <cctype>

namespace bsl
{
namespace bsl {
// Import selected symbols into bsl namespace
using native_std::isalnum;
using native_std::isalpha;
Expand Down
3 changes: 1 addition & 2 deletions groups/bsl/bsl+bslhdrs/bsl_clocale.h
Expand Up @@ -23,8 +23,7 @@ BSLS_IDENT("$Id: $")

#include <clocale>

namespace bsl
{
namespace bsl {
// Import selected symbols into bsl namespace
using native_std::lconv;
using native_std::localeconv;
Expand Down
3 changes: 1 addition & 2 deletions groups/bsl/bsl+bslhdrs/bsl_cmath.h
Expand Up @@ -24,8 +24,7 @@ BSLS_IDENT("$Id: $")
#include <cmath>


namespace bsl
{
namespace bsl {
// Import selected symbols into bsl namespace
using native_std::abs;
using native_std::acos;
Expand Down
3 changes: 1 addition & 2 deletions groups/bsl/bsl+bslhdrs/bsl_complex.h
Expand Up @@ -23,8 +23,7 @@ BSLS_IDENT("$Id: $")

#include <complex>

namespace bsl
{
namespace bsl {
// Import selected symbols into bsl namespace

using native_std::abs;
Expand Down
3 changes: 1 addition & 2 deletions groups/bsl/bsl+bslhdrs/bsl_csetjmp.h
Expand Up @@ -23,8 +23,7 @@ BSLS_IDENT("$Id: $")

#include <csetjmp>

namespace bsl
{
namespace bsl {
// Import selected symbols into bsl namespace
using native_std::jmp_buf;
using native_std::longjmp;
Expand Down
3 changes: 1 addition & 2 deletions groups/bsl/bsl+bslhdrs/bsl_csignal.h
Expand Up @@ -23,8 +23,7 @@ BSLS_IDENT("$Id: $")

#include <csignal>

namespace bsl
{
namespace bsl {
// Import selected symbols into bsl namespace
using native_std::signal;
using native_std::raise;
Expand Down
3 changes: 1 addition & 2 deletions groups/bsl/bsl+bslhdrs/bsl_cstdarg.h
Expand Up @@ -23,8 +23,7 @@ BSLS_IDENT("$Id: $")

#include <cstdarg>

namespace bsl
{
namespace bsl {
// Import selected symbols into bsl namespace
using native_std::va_list;
} // close package namespace
Expand Down
3 changes: 1 addition & 2 deletions groups/bsl/bsl+bslhdrs/bsl_cstddef.h
Expand Up @@ -27,8 +27,7 @@ BSLS_IDENT("$Id: $")

#include <cstddef>

namespace bsl
{
namespace bsl {
// Import selected symbols into bsl namespace
using native_std::ptrdiff_t;
using native_std::size_t;
Expand Down
3 changes: 1 addition & 2 deletions groups/bsl/bsl+bslhdrs/bsl_cstdio.h
Expand Up @@ -23,8 +23,7 @@ BSLS_IDENT("$Id: $")

#include <cstdio>

namespace bsl
{
namespace bsl {
// Import selected symbols into bsl namespace
using native_std::FILE;
using native_std::fpos_t;
Expand Down
3 changes: 1 addition & 2 deletions groups/bsl/bsl+bslhdrs/bsl_cstdlib.h
Expand Up @@ -23,8 +23,7 @@ BSLS_IDENT("$Id: $")

#include <cstdlib>

namespace bsl
{
namespace bsl {
// Import selected symbols into bsl namespace

using native_std::abort;
Expand Down
3 changes: 1 addition & 2 deletions groups/bsl/bsl+bslhdrs/bsl_cstring.h
Expand Up @@ -23,8 +23,7 @@ BSLS_IDENT("$Id: $")

#include <cstring>

namespace bsl
{
namespace bsl {
// Import selected symbols into bsl namespace

using native_std::memchr;
Expand Down

0 comments on commit b694440

Please sign in to comment.