Commit 4b61fe9a authored by Lynn Garren's avatar Lynn Garren
Browse files

remove C++0X-like keywords

parent f0cc6c0c
2011-06-30 W. E. Brown <wb@fnal.gov>
- removing C++0X-like keywords constexpr, noexcept, and nullptr
to avoid collision with similar symbols in other packages
- Utility/keywords.h is now empty
==============================
11.11.10 Release CLHEP-2.1.0.1
==============================
......
......@@ -14,9 +14,9 @@
// C++0X-like keywords: remove once C++0X is here to stay
#define constexpr const
#define noexcept throw()
#define nullptr 0
//#define constexpr const
//#define noexcept throw()
//#define nullptr 0
#endif // CLHEP_KEYWORDS_H
......
This diff is collapsed.
......@@ -11,7 +11,6 @@
#include "CLHEP/Utility/defs.h"
#include "CLHEP/Utility/keywords.h"
namespace CLHEP {
......@@ -19,8 +18,8 @@ namespace CLHEP {
class noncopyable
{
protected:
noncopyable () noexcept { }
~noncopyable() noexcept { }
noncopyable () throw () { }
~noncopyable() throw () { }
private:
noncopyable ( noncopyable const & ); // = delete;
......
......@@ -11,7 +11,6 @@
#include "CLHEP/Utility/defs.h"
#include "CLHEP/Utility/keywords.h"
#include <memory> // for auto_ptr
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment