From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1059) id E97AC3985C05; Tue, 3 Nov 2020 14:40:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E97AC3985C05 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Nathan Sidwell To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/c++-modules] Remove unneeded fn X-Act-Checkin: gcc X-Git-Author: Nathan Sidwell X-Git-Refname: refs/heads/devel/c++-modules X-Git-Oldrev: c385d545b04abe0eae0886b849e02689bcef2642 X-Git-Newrev: b269b6ce4593768b2c37de9af4dbeebab60af520 Message-Id: <20201103144044.E97AC3985C05@sourceware.org> Date: Tue, 3 Nov 2020 14:40:44 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Nov 2020 14:40:45 -0000 https://gcc.gnu.org/g:b269b6ce4593768b2c37de9af4dbeebab60af520 commit b269b6ce4593768b2c37de9af4dbeebab60af520 Author: Nathan Sidwell Date: Mon Nov 2 10:36:15 2020 -0800 Remove unneeded fn libcpp/ * include/cpplib.h (cpp_enable_filename_token): Delete. * macro.c (cpp_enable_filename_token): Delete. Diff: --- ChangeLog.modules | 4 ++++ libcpp/include/cpplib.h | 1 - libcpp/macro.c | 6 ------ 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ChangeLog.modules b/ChangeLog.modules index 4430110df2f..8ec8c85e04b 100644 --- a/ChangeLog.modules +++ b/ChangeLog.modules @@ -1,5 +1,9 @@ 2020-11-02 Nathan Sidwell + libcpp/ + * include/cpplib.h (cpp_enable_filename_token): Delete. + * macro.c (cpp_enable_filename_token): Delete. + Merge trunk b2a31e2c341 gcc/cp/ diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h index fca58a5f9ee..81be6457951 100644 --- a/libcpp/include/cpplib.h +++ b/libcpp/include/cpplib.h @@ -1054,7 +1054,6 @@ extern int cpp_avoid_paste (cpp_reader *, const cpp_token *, extern const cpp_token *cpp_get_token (cpp_reader *); extern const cpp_token *cpp_get_token_with_location (cpp_reader *, location_t *); -extern void cpp_enable_filename_token (cpp_reader *, bool); inline bool cpp_user_macro_p (const cpp_hashnode *node) { return node->type == NT_USER_MACRO; diff --git a/libcpp/macro.c b/libcpp/macro.c index d1694a934a7..f5f280dfdc7 100644 --- a/libcpp/macro.c +++ b/libcpp/macro.c @@ -3075,12 +3075,6 @@ cpp_get_token_with_location (cpp_reader *pfile, location_t *loc) return cpp_get_token_1 (pfile, loc); } -void -cpp_enable_filename_token (cpp_reader *pfile, bool enable) -{ - pfile->state.angled_headers += enable ? +1 : -1; -} - /* Returns true if we're expanding an object-like macro that was defined in a system header. Just checks the macro at the top of the stack. Used for diagnostic suppression. */