From d2d9341b8ace86f7fc9484159765c45977652b3a Mon Sep 17 00:00:00 2001 From: Jeff Walden Date: Sun, 20 Nov 2011 12:22:51 -0800 Subject: [PATCH] Bug 704127 - Move C++ attribute support out of mozilla/Types.h and into mozilla/Attributes.h so that it can be used by code that's not yet compatible with the full mfbt experience. r=cjones --HG-- extra : rebase_source : 7b653358a73f222c055f5139e33ca470475f88c9 --- gfx/layers/basic/BasicLayers.cpp | 4 +- js/src/Makefile.in | 1 + js/src/jswrapper.h | 2 +- js/src/vm/String.h | 2 +- layout/generic/nsFloatManager.h | 2 +- mfbt/Attributes.h | 161 +++++++++++++++++++++++++++++++ mfbt/RangedPtr.h | 5 +- mfbt/RefPtr.h | 1 + mfbt/Types.h | 110 --------------------- 9 files changed, 169 insertions(+), 119 deletions(-) create mode 100644 mfbt/Attributes.h diff --git a/gfx/layers/basic/BasicLayers.cpp b/gfx/layers/basic/BasicLayers.cpp index babb93439846..2aa2822063f3 100644 --- a/gfx/layers/basic/BasicLayers.cpp +++ b/gfx/layers/basic/BasicLayers.cpp @@ -36,6 +36,8 @@ * * ***** END LICENSE BLOCK ***** */ +#include "mozilla/Attributes.h" + #include "gfxSharedImageSurface.h" #include "mozilla/layers/PLayerChild.h" @@ -43,8 +45,6 @@ #include "mozilla/layers/PLayersParent.h" #include "mozilla/gfx/2D.h" -#include "mozilla/Types.h" - #include "ipc/ShadowLayerChild.h" #include "BasicLayers.h" diff --git a/js/src/Makefile.in b/js/src/Makefile.in index 253c62fc78e9..c2329b3baf60 100644 --- a/js/src/Makefile.in +++ b/js/src/Makefile.in @@ -282,6 +282,7 @@ VPATH += \ EXPORTS_NAMESPACES += mozilla EXPORTS_mozilla = \ + Attributes.h \ GuardObjects.h \ RangedPtr.h \ RefPtr.h \ diff --git a/js/src/jswrapper.h b/js/src/jswrapper.h index 19a37b60f543..0b76f62e34fd 100644 --- a/js/src/jswrapper.h +++ b/js/src/jswrapper.h @@ -42,7 +42,7 @@ #ifndef jswrapper_h___ #define jswrapper_h___ -#include "mozilla/Types.h" +#include "mozilla/Attributes.h" #include "jsapi.h" #include "jsproxy.h" diff --git a/js/src/vm/String.h b/js/src/vm/String.h index 3ab907ce6ece..d2ed9cd17477 100644 --- a/js/src/vm/String.h +++ b/js/src/vm/String.h @@ -41,7 +41,7 @@ #ifndef String_h_ #define String_h_ -#include "mozilla/Util.h" +#include "mozilla/Attributes.h" #include "jsapi.h" #include "jscell.h" diff --git a/layout/generic/nsFloatManager.h b/layout/generic/nsFloatManager.h index 88ed01752084..d2ebd1975ca5 100644 --- a/layout/generic/nsFloatManager.h +++ b/layout/generic/nsFloatManager.h @@ -42,7 +42,7 @@ #ifndef nsFloatManager_h_ #define nsFloatManager_h_ -#include "mozilla/Types.h" +#include "mozilla/Attributes.h" #include "nsIntervalSet.h" #include "nsCoord.h" diff --git a/mfbt/Attributes.h b/mfbt/Attributes.h new file mode 100644 index 000000000000..11057a3c72b7 --- /dev/null +++ b/mfbt/Attributes.h @@ -0,0 +1,161 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- + * vim: set ts=8 sw=4 et tw=99 ft=cpp: + * + * ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (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.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Mozilla Code. + * + * The Initial Developer of the Original Code is + * The Mozilla Foundation + * Portions created by the Initial Developer are Copyright (C) 2011 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Jeff Walden (original author) + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +/* Implementations of various C++ class and method modifier attributes. */ + +#ifndef mozilla_Attributes_h_ +#define mozilla_Attributes_h_ + +/* + * This header does not include any other headers so that it can be included by + * code that is (only currently) mfbt-incompatible. + */ + +#ifndef __cplusplus +#error "mozilla/Attributes.h is only relevant to C++ code." +#endif + +/* + * g++ requires -std=c++0x or -std=gnu++0x to support C++11 functionality + * without warnings (functionality used by the macros below). These modes are + * detectable by checking whether __GXX_EXPERIMENTAL_CXX0X__ is defined or, more + * standardly, by checking whether __cplusplus has a C++11 or greater value. + * Current versions of g++ do not correctly set __cplusplus, so we check both + * for forward compatibility. + */ +#if defined(__clang__) +# if __clang_major__ >= 3 +# define MOZ_HAVE_CXX11_DELETE +# define MOZ_HAVE_CXX11_OVERRIDE +# elif __clang_major__ == 2 +# if __clang_minor__ >= 9 +# define MOZ_HAVE_CXX11_DELETE +# endif +# endif +#elif defined(__GNUC__) +# if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L +# if __GNUC__ > 4 +# define MOZ_HAVE_CXX11_DELETE +# define MOZ_HAVE_CXX11_OVERRIDE +# elif __GNUC__ == 4 +# if __GNUC_MINOR__ >= 7 +# define MOZ_HAVE_CXX11_OVERRIDE +# endif +# if __GNUC_MINOR__ >= 4 +# define MOZ_HAVE_CXX11_DELETE +# endif +# endif +# endif +#elif defined(_MSC_VER) +# if _MSC_VER >= 1400 +# define MOZ_HAVE_CXX11_OVERRIDE +# endif +#endif + +/* + * MOZ_DELETE, specified immediately prior to the ';' terminating an undefined- + * method declaration, attempts to delete that method from the corresponding + * class. An attempt to use the method will always produce an error *at compile + * time* (instead of sometimes as late as link time) when this macro can be + * implemented. For example, you can use MOZ_DELETE to produce classes with no + * implicit copy constructor or assignment operator: + * + * struct NonCopyable + * { + * private: + * NonCopyable(const NonCopyable& other) MOZ_DELETE; + * void operator=(const NonCopyable& other) MOZ_DELETE; + * }; + * + * If MOZ_DELETE can't be implemented for the current compiler, use of the + * annotated method will still cause an error, but the error might occur at link + * time in some cases rather than at compile time. + * + * MOZ_DELETE relies on C++11 functionality not universally implemented. As a + * backstop, method declarations using MOZ_DELETE should be private. + */ +#if defined(MOZ_HAVE_CXX11_DELETE) +# define MOZ_DELETE = delete +#else +# define MOZ_DELETE /* no support */ +#endif + +/* + * MOZ_OVERRIDE explicitly indicates that a virtual member function in a class + * overrides a member function of a base class, rather than potentially being a + * new member function. MOZ_OVERRIDE should be placed immediately before the + * ';' terminating the member function's declaration, or before '= 0;' if the + * member function is pure. If the member function is defined in the class + * definition, it should appear before the opening brace of the function body. + * + * class Base + * { + * public: + * virtual void f() = 0; + * }; + * class Derived1 : public Base + * { + * public: + * virtual void f() MOZ_OVERRIDE; + * }; + * class Derived2 : public Base + * { + * public: + * virtual void f() MOZ_OVERRIDE = 0; + * }; + * class Derived3 : public Base + * { + * public: + * virtual void f() MOZ_OVERRIDE { } + * }; + * + * In compilers supporting C++11 override controls, MOZ_OVERRIDE *requires* that + * the function marked with it override a member function of a base class: it + * is a compile error if it does not. Otherwise MOZ_OVERRIDE does not affect + * semantics and merely documents the override relationship to the reader (but + * of course must still be used correctly to not break C++11 compilers). + */ +#if defined(MOZ_HAVE_CXX11_OVERRIDE) +# define MOZ_OVERRIDE override +#else +# define MOZ_OVERRIDE /* no support */ +#endif + +#endif /* mozilla_Attributes_h_ */ diff --git a/mfbt/RangedPtr.h b/mfbt/RangedPtr.h index 82726755dd16..d0a375a1a59e 100644 --- a/mfbt/RangedPtr.h +++ b/mfbt/RangedPtr.h @@ -41,10 +41,9 @@ #ifndef mozilla_RangedPtr_h_ #define mozilla_RangedPtr_h_ +#include "mozilla/Attributes.h" #include "mozilla/Util.h" -#ifdef __cplusplus - namespace mozilla { /* @@ -275,6 +274,4 @@ class RangedPtr } /* namespace mozilla */ -#endif /* __cplusplus */ - #endif /* mozilla_RangedPtr_h_ */ diff --git a/mfbt/RefPtr.h b/mfbt/RefPtr.h index ccc18a894e8a..fa06f8b84dbd 100644 --- a/mfbt/RefPtr.h +++ b/mfbt/RefPtr.h @@ -41,6 +41,7 @@ #ifndef mozilla_RefPtr_h_ #define mozilla_RefPtr_h_ +#include "mozilla/Attributes.h" #include "mozilla/Util.h" /** diff --git a/mfbt/Types.h b/mfbt/Types.h index 24bd6263e2da..cf73f18b5a19 100644 --- a/mfbt/Types.h +++ b/mfbt/Types.h @@ -88,114 +88,4 @@ #define MOZ_BEGIN_EXTERN_C JS_BEGIN_EXTERN_C #define MOZ_END_EXTERN_C JS_END_EXTERN_C -#ifdef __cplusplus - -/* - * g++ requires -std=c++0x or -std=gnu++0x to support C++11 functionality - * without warnings (functionality used by the macros below). These modes are - * detectable by checking whether __GXX_EXPERIMENTAL_CXX0X__ is defined or, more - * standardly, by checking whether __cplusplus has a C++11 or greater value. - * Current versions of g++ do not correctly set __cplusplus, so we check both - * for forward compatibility. - */ -#if defined(__clang__) -# if __clang_major__ >= 3 -# define MOZ_HAVE_CXX11_DELETE -# define MOZ_HAVE_CXX11_OVERRIDE -# elif __clang_major__ == 2 -# if __clang_minor__ >= 9 -# define MOZ_HAVE_CXX11_DELETE -# endif -# endif -#elif defined(__GNUC__) -# if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L -# if __GNUC__ > 4 -# define MOZ_HAVE_CXX11_DELETE -# define MOZ_HAVE_CXX11_OVERRIDE -# elif __GNUC__ == 4 -# if __GNUC_MINOR__ >= 7 -# define MOZ_HAVE_CXX11_OVERRIDE -# endif -# if __GNUC_MINOR__ >= 4 -# define MOZ_HAVE_CXX11_DELETE -# endif -# endif -# endif -#elif defined(_MSC_VER) -# if _MSC_VER >= 1400 -# define MOZ_HAVE_CXX11_OVERRIDE -# endif -#endif - -/* - * MOZ_DELETE, specified immediately prior to the ';' terminating an undefined- - * method declaration, attempts to delete that method from the corresponding - * class. An attempt to use the method will always produce an error *at compile - * time* (instead of sometimes as late as link time) when this macro can be - * implemented. For example, you can use MOZ_DELETE to produce classes with no - * implicit copy constructor or assignment operator: - * - * struct NonCopyable - * { - * private: - * NonCopyable(const NonCopyable& other) MOZ_DELETE; - * void operator=(const NonCopyable& other) MOZ_DELETE; - * }; - * - * If MOZ_DELETE can't be implemented for the current compiler, use of the - * annotated method will still cause an error, but the error might occur at link - * time in some cases rather than at compile time. - * - * MOZ_DELETE relies on C++11 functionality not universally implemented. As a - * backstop, method declarations using MOZ_DELETE should be private. - */ -#if defined(MOZ_HAVE_CXX11_DELETE) -# define MOZ_DELETE = delete -#else -# define MOZ_DELETE /* no support */ -#endif - -/* - * MOZ_OVERRIDE explicitly indicates that a virtual member function in a class - * overrides a member function of a base class, rather than potentially being a - * new member function. MOZ_OVERRIDE should be placed immediately before the - * ';' terminating the member function's declaration, or before '= 0;' if the - * member function is pure. If the member function is defined in the class - * definition, it should appear before the opening brace of the function body. - * - * class Base - * { - * public: - * virtual void f() = 0; - * }; - * class Derived1 : public Base - * { - * public: - * virtual void f() MOZ_OVERRIDE; - * }; - * class Derived2 : public Base - * { - * public: - * virtual void f() MOZ_OVERRIDE = 0; - * }; - * class Derived3 : public Base - * { - * public: - * virtual void f() MOZ_OVERRIDE { } - * }; - * - * In compilers supporting C++11 override controls, MOZ_OVERRIDE *requires* that - * the function marked with it override a member function of a base class: it - * is a compile error if it does not. Otherwise MOZ_OVERRIDE does not affect - * semantics and merely documents the override relationship to the reader (but - * of course must still be used correctly to not break C++11 compilers). - */ -#if defined(MOZ_HAVE_CXX11_OVERRIDE) -# define MOZ_OVERRIDE override -#else -# define MOZ_OVERRIDE /* no support */ -#endif - -#endif /* __cplusplus */ - #endif /* mozilla_Types_h_ */