From ac0a852f9045a8c49fa828dd53b2d1d31df00eb7 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@qt.io>
Date: Thu, 18 Aug 2016 12:27:08 +0200
Subject: [PATCH] Revert "Cmb: Workaround for gcc 4.7 bug"

This reverts commmit e2d60fdcc37a6b7cd47b7495061752266d101d06 because we
require "g++ 4.8 or later" nowadays.

Change-Id: I1ce7b37bbf8c73ce4466a35b36fd66e680339fe9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 .../ipcsource/projectpartsdonotexistexception.h             | 6 ------
 .../ipcsource/translationunitalreadyexistsexception.h       | 6 ------
 .../ipcsource/translationunitdoesnotexistexception.h        | 6 ------
 .../ipcsource/translationunitfilenotexitexception.h         | 6 ------
 .../clangbackend/ipcsource/translationunitisnullexception.h | 6 ------
 .../ipcsource/translationunitparseerrorexception.h          | 6 ------
 .../ipcsource/translationunitreparseerrorexception.h        | 6 ------
 7 files changed, 42 deletions(-)

diff --git a/src/tools/clangbackend/ipcsource/projectpartsdonotexistexception.h b/src/tools/clangbackend/ipcsource/projectpartsdonotexistexception.h
index 2b5b1088282..dd7f3780589 100644
--- a/src/tools/clangbackend/ipcsource/projectpartsdonotexistexception.h
+++ b/src/tools/clangbackend/ipcsource/projectpartsdonotexistexception.h
@@ -40,12 +40,6 @@ public:
 
     const char *what() const Q_DECL_NOEXCEPT override;
 
-#if defined(__GNUC__) && !defined(__clang__)
-#  if !__GNUC_PREREQ(4,8)
-    ~ProjectPartDoNotExistException() noexcept {}
-#  endif
-#endif
-
 private:
     Utf8StringVector projectPartIds_;
     mutable Utf8String what_;
diff --git a/src/tools/clangbackend/ipcsource/translationunitalreadyexistsexception.h b/src/tools/clangbackend/ipcsource/translationunitalreadyexistsexception.h
index 0db693dc0e4..5eff1188c04 100644
--- a/src/tools/clangbackend/ipcsource/translationunitalreadyexistsexception.h
+++ b/src/tools/clangbackend/ipcsource/translationunitalreadyexistsexception.h
@@ -39,12 +39,6 @@ public:
 
     const char *what() const Q_DECL_NOEXCEPT override;
 
-#if defined(__GNUC__) && !defined(__clang__)
-#  if !__GNUC_PREREQ(4,8)
-    ~TranslationUnitAlreadyExistsException() noexcept {}
-#  endif
-#endif
-
 private:
     FileContainer fileContainer_;
     mutable Utf8String what_;
diff --git a/src/tools/clangbackend/ipcsource/translationunitdoesnotexistexception.h b/src/tools/clangbackend/ipcsource/translationunitdoesnotexistexception.h
index f4943d9a1c8..9b343f6a554 100644
--- a/src/tools/clangbackend/ipcsource/translationunitdoesnotexistexception.h
+++ b/src/tools/clangbackend/ipcsource/translationunitdoesnotexistexception.h
@@ -39,12 +39,6 @@ public:
 
     const char *what() const Q_DECL_NOEXCEPT override;
 
-#if defined(__GNUC__) && !defined(__clang__)
-#  if !__GNUC_PREREQ(4,8)
-    ~TranslationUnitDoesNotExistException() noexcept {}
-#  endif
-#endif
-
 private:
     FileContainer fileContainer_;
     mutable Utf8String what_;
diff --git a/src/tools/clangbackend/ipcsource/translationunitfilenotexitexception.h b/src/tools/clangbackend/ipcsource/translationunitfilenotexitexception.h
index 9081f3757e6..313ee030b9b 100644
--- a/src/tools/clangbackend/ipcsource/translationunitfilenotexitexception.h
+++ b/src/tools/clangbackend/ipcsource/translationunitfilenotexitexception.h
@@ -40,12 +40,6 @@ public:
 
     const char *what() const Q_DECL_NOEXCEPT override;
 
-#if defined(__GNUC__) && !defined(__clang__)
-#  if !__GNUC_PREREQ(4,8)
-    ~TranslationUnitFileNotExitsException() noexcept {}
-#  endif
-#endif
-
 private:
     Utf8String filePath_;
     mutable Utf8String what_;
diff --git a/src/tools/clangbackend/ipcsource/translationunitisnullexception.h b/src/tools/clangbackend/ipcsource/translationunitisnullexception.h
index c64c53369e7..904f5caf21f 100644
--- a/src/tools/clangbackend/ipcsource/translationunitisnullexception.h
+++ b/src/tools/clangbackend/ipcsource/translationunitisnullexception.h
@@ -35,12 +35,6 @@ class TranslationUnitIsNullException : public std::exception
 {
 public:
     const char *what() const Q_DECL_NOEXCEPT override;
-
-#if defined(__GNUC__) && !defined(__clang__)
-#  if !__GNUC_PREREQ(4,8)
-    ~TranslationUnitIsNullException() noexcept {}
-#  endif
-#endif
 };
 
 } // namespace ClangBackEnd
diff --git a/src/tools/clangbackend/ipcsource/translationunitparseerrorexception.h b/src/tools/clangbackend/ipcsource/translationunitparseerrorexception.h
index 928a467b6a0..bd20fde957b 100644
--- a/src/tools/clangbackend/ipcsource/translationunitparseerrorexception.h
+++ b/src/tools/clangbackend/ipcsource/translationunitparseerrorexception.h
@@ -45,12 +45,6 @@ public:
 
     const char *what() const Q_DECL_NOEXCEPT override;
 
-#if defined(__GNUC__) && !defined(__clang__)
-#  if !__GNUC_PREREQ(4,8)
-    ~TranslationUnitParseErrorException() noexcept {}
-#  endif
-#endif
-
 private:
     Utf8String filePath_;
     Utf8String projectPartId_;
diff --git a/src/tools/clangbackend/ipcsource/translationunitreparseerrorexception.h b/src/tools/clangbackend/ipcsource/translationunitreparseerrorexception.h
index 126a24c7e9e..a9446dd3218 100644
--- a/src/tools/clangbackend/ipcsource/translationunitreparseerrorexception.h
+++ b/src/tools/clangbackend/ipcsource/translationunitreparseerrorexception.h
@@ -45,12 +45,6 @@ public:
 
     const char *what() const Q_DECL_NOEXCEPT override;
 
-#if defined(__GNUC__) && !defined(__clang__)
-#  if !__GNUC_PREREQ(4,8)
-    ~TranslationUnitReparseErrorException() noexcept {}
-#  endif
-#endif
-
 private:
     Utf8String filePath_;
     Utf8String projectPartId_;