mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-17 07:15:46 +00:00
2d58b9d7fb
For reasons unknown, if you give MSVC:
// Foo.h
struct Foo
{
...
};
extern const Foo gFoo;
// Foo.cpp, which necessarily includes Foo.h.
extern constexpr Foo gFoo = {
};
MSVC will create a static initializer for gFoo and place it in the
read/write data section, rather than the read-only data section.
Removing the `extern const` declaration seems to be enough to make this
problem go away. We need to adjust the declaration of other variables
to compensate for the non-visibility of gFoo in the header file.
51 lines
1.2 KiB
C++
51 lines
1.2 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#ifndef nsGkAtoms_h___
|
|
#define nsGkAtoms_h___
|
|
|
|
#include "nsAtom.h"
|
|
#include "nsStaticAtom.h"
|
|
|
|
namespace mozilla {
|
|
namespace detail {
|
|
|
|
struct GkAtoms
|
|
{
|
|
#define GK_ATOM(name_, value_) NS_STATIC_ATOM_DECL_STRING(name_, value_)
|
|
#include "nsGkAtomList.h"
|
|
#undef GK_ATOM
|
|
|
|
enum class Atoms {
|
|
#define GK_ATOM(name_, value_) NS_STATIC_ATOM_ENUM(name_)
|
|
#include "nsGkAtomList.h"
|
|
#undef GK_ATOM
|
|
AtomsCount
|
|
};
|
|
|
|
const nsStaticAtom mAtoms[static_cast<size_t>(Atoms::AtomsCount)];
|
|
};
|
|
|
|
} // namespace detail
|
|
} // namespace mozilla
|
|
|
|
class nsGkAtoms
|
|
{
|
|
private:
|
|
static const nsStaticAtom* const sAtoms;
|
|
static constexpr size_t sAtomsLen =
|
|
static_cast<size_t>(mozilla::detail::GkAtoms::Atoms::AtomsCount);
|
|
|
|
public:
|
|
static void RegisterStaticAtoms();
|
|
|
|
#define GK_ATOM(name_, value_) NS_STATIC_ATOM_DECL_PTR(nsStaticAtom, name_)
|
|
#include "nsGkAtomList.h"
|
|
#undef GK_ATOM
|
|
};
|
|
|
|
#endif /* nsGkAtoms_h___ */
|