зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1146057: Remove support for GCC 4.6, r=keeler
Since Gecko now requires GCC 4.7 or later, we no longer need to work around the lack of support for "override" and "final" in earlier versions of GCC. --HG-- extra : rebase_source : 0f104f16be9e7c1ff87bbdd0d4ba6700b1081fb8
This commit is contained in:
Родитель
d89cf35a31
Коммит
a0437d5b8f
|
@ -10,7 +10,6 @@
|
|||
#include "certdb.h"
|
||||
#include "base64.h"
|
||||
#include "hasht.h"
|
||||
#include "pkix/stdkeywords.h"
|
||||
#include "pkix/pkixtypes.h"
|
||||
#include "pk11pub.h"
|
||||
#include "secerr.h"
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
#include "nsSiteSecurityService.h"
|
||||
#include "nsString.h"
|
||||
#include "nsTArray.h"
|
||||
#include "pkix/stdkeywords.h"
|
||||
#include "pkix/pkixtypes.h"
|
||||
#include "prlog.h"
|
||||
#include "RootCertificateTelemetryUtils.h"
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
|
||||
#include <cstring>
|
||||
|
||||
#include "pkix/stdkeywords.h"
|
||||
#include "pkix/Result.h"
|
||||
#include "stdint.h"
|
||||
|
||||
|
|
|
@ -25,8 +25,6 @@
|
|||
#ifndef mozilla_pkix_ScopedPtr_h
|
||||
#define mozilla_pkix_ScopedPtr_h
|
||||
|
||||
#include "pkix/stdkeywords.h"
|
||||
|
||||
namespace mozilla { namespace pkix {
|
||||
|
||||
// Similar to boost::scoped_ptr and std::unique_ptr. Does not support copying
|
||||
|
|
|
@ -30,7 +30,6 @@
|
|||
#include <stdint.h>
|
||||
|
||||
#include "pkix/Result.h"
|
||||
#include "pkix/stdkeywords.h"
|
||||
|
||||
namespace mozilla { namespace pkix {
|
||||
|
||||
|
|
|
@ -1,38 +0,0 @@
|
|||
/* -*- 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 code is made available to you under your choice of the following sets
|
||||
* of licensing terms:
|
||||
*/
|
||||
/* 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/.
|
||||
*/
|
||||
/* Copyright 2013 Mozilla Contributors
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#ifndef mozilla_pkix_stdkeywords_h
|
||||
#define mozilla_pkix_stdkeywords_h
|
||||
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
|
||||
// GCC does not understand final/override until 4.7
|
||||
#if __GNUC__ * 100 + __GNUC_MINOR__ < 407
|
||||
#define final
|
||||
#define override
|
||||
#endif
|
||||
|
||||
#endif // defined(__GNUC__) && !defined(__clang__)
|
||||
|
||||
#endif // mozilla_pkix_stdkeywords_h
|
Загрузка…
Ссылка в новой задаче