[flang] Rename features.h because many linux systems have an include file called...

Original-commit: flang-compiler/f18@fc34d0ddf355e4f978e2cb984486191041c24ea9
Reviewed-on: https://github.com/flang-compiler/f18/pull/826
Tree-same-pre-rewrite: false

diff --git a/flang/lib/common/CMakeLists.txt b/flang/lib/common/CMakeLists.txt
index 94a7098..facefc3 100644 (file)
--- a/flang/lib/common/CMakeLists.txt
+++ b/flang/lib/common/CMakeLists.txt
@@ -15,7 +15,7 @@
 add_library(FortranCommon
   Fortran.cc
   default-kinds.cc
-  features.cc
+  flang-features.cc
   idioms.cc
 )
 

diff --git a/flang/lib/common/features.cc b/flang/lib/common/flang-features.cc
similarity index 98%
rename from flang/lib/common/features.cc
rename to flang/lib/common/flang-features.cc
index ef48190..99c158f 100644 (file)
--- a/flang/lib/common/features.cc
+++ b/flang/lib/common/flang-features.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "features.h"
+#include "flang-features.h"
 #include "Fortran.h"
 #include "idioms.h"
 

diff --git a/flang/lib/common/features.h b/flang/lib/common/flang-features.h
similarity index 100%
rename from flang/lib/common/features.h
rename to flang/lib/common/flang-features.h

diff --git a/flang/lib/parser/basic-parsers.h b/flang/lib/parser/basic-parsers.h
index 46a349e..6c73afb 100644 (file)
--- a/flang/lib/parser/basic-parsers.h
+++ b/flang/lib/parser/basic-parsers.h
@@ -33,7 +33,7 @@
 #include "parse-state.h"
 #include "provenance.h"
 #include "user-state.h"
-#include "../common/features.h"
+#include "../common/flang-features.h"
 #include "../common/idioms.h"
 #include "../common/indirection.h"
 #include <cstring>

diff --git a/flang/lib/parser/parse-state.h b/flang/lib/parser/parse-state.h
index ea64fa2..d7acadb 100644 (file)
--- a/flang/lib/parser/parse-state.h
+++ b/flang/lib/parser/parse-state.h
@@ -25,7 +25,7 @@
 #include "message.h"
 #include "provenance.h"
 #include "user-state.h"
-#include "../common/features.h"
+#include "../common/flang-features.h"
 #include "../common/idioms.h"
 #include <cstddef>
 #include <cstring>

diff --git a/flang/lib/parser/parsing.h b/flang/lib/parser/parsing.h
index 6dfb526..903f133 100644 (file)
--- a/flang/lib/parser/parsing.h
+++ b/flang/lib/parser/parsing.h
@@ -20,7 +20,7 @@
 #include "message.h"
 #include "parse-tree.h"
 #include "provenance.h"
-#include "../common/features.h"
+#include "../common/flang-features.h"
 #include <optional>
 #include <ostream>
 #include <string>

diff --git a/flang/lib/parser/prescan.h b/flang/lib/parser/prescan.h
index b74dc9b..44080d9 100644 (file)
--- a/flang/lib/parser/prescan.h
+++ b/flang/lib/parser/prescan.h
@@ -26,7 +26,7 @@
 #include "message.h"
 #include "provenance.h"
 #include "token-sequence.h"
-#include "../common/features.h"
+#include "../common/flang-features.h"
 #include <bitset>
 #include <optional>
 #include <string>

diff --git a/flang/lib/parser/user-state.h b/flang/lib/parser/user-state.h
index c086e63..e3d03e2 100644 (file)
--- a/flang/lib/parser/user-state.h
+++ b/flang/lib/parser/user-state.h
@@ -22,7 +22,7 @@
 
 #include "char-block.h"
 #include "parse-tree.h"
-#include "../common/features.h"
+#include "../common/flang-features.h"
 #include "../common/idioms.h"
 #include <cinttypes>
 #include <optional>

diff --git a/flang/lib/semantics/resolve-names-utils.cc b/flang/lib/semantics/resolve-names-utils.cc
index e96a65e..1038e1e 100644 (file)
--- a/flang/lib/semantics/resolve-names-utils.cc
+++ b/flang/lib/semantics/resolve-names-utils.cc
@@ -16,7 +16,7 @@
 #include "expression.h"
 #include "semantics.h"
 #include "tools.h"
-#include "../common/features.h"
+#include "../common/flang-features.h"
 #include "../common/idioms.h"
 #include "../common/indirection.h"
 #include "../evaluate/fold.h"

diff --git a/flang/lib/semantics/semantics.h b/flang/lib/semantics/semantics.h
index a8fc8ef..e793206 100644 (file)
--- a/flang/lib/semantics/semantics.h
+++ b/flang/lib/semantics/semantics.h
@@ -16,7 +16,7 @@
 #define FORTRAN_SEMANTICS_SEMANTICS_H_
 
 #include "scope.h"
-#include "../common/features.h"
+#include "../common/flang-features.h"
 #include "../evaluate/common.h"
 #include "../evaluate/intrinsics.h"
 #include "../parser/message.h"

diff --git a/flang/tools/f18/f18-parse-demo.cc b/flang/tools/f18/f18-parse-demo.cc
index 37006e9..bc950f2 100644 (file)
--- a/flang/tools/f18/f18-parse-demo.cc
+++ b/flang/tools/f18/f18-parse-demo.cc
@@ -28,7 +28,7 @@
 // F18 compiler under development.
 
 #include "../../lib/common/default-kinds.h"
-#include "../../lib/common/features.h"
+#include "../../lib/common/flang-features.h"
 #include "../../lib/parser/characters.h"
 #include "../../lib/parser/dump-parse-tree.h"
 #include "../../lib/parser/message.h"

diff --git a/flang/tools/f18/f18.cc b/flang/tools/f18/f18.cc
index 366d0dc..4849acf 100644 (file)
--- a/flang/tools/f18/f18.cc
+++ b/flang/tools/f18/f18.cc
@@ -15,7 +15,7 @@
 // Temporary Fortran front end driver main program for development scaffolding.
 
 #include "../../lib/common/default-kinds.h"
-#include "../../lib/common/features.h"
+#include "../../lib/common/flang-features.h"
 #include "../../lib/evaluate/expression.h"
 #include "../../lib/parser/characters.h"
 #include "../../lib/parser/dump-parse-tree.h"