From 618cc10481e348d6729746973097a80319a34003 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 19 Apr 2010 03:43:14 +0000 Subject: [PATCH] Call explicit type register rule to avoid errors when the type file is imported from another type file. (Fixes #4118). [SVN r61393] --- v2/tools/types/cpp.jam | 8 ++++---- v2/tools/types/objc.jam | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/v2/tools/types/cpp.jam b/v2/tools/types/cpp.jam index defa3e566..3159cdd77 100644 --- a/v2/tools/types/cpp.jam +++ b/v2/tools/types/cpp.jam @@ -69,10 +69,10 @@ class c-scanner : scanner scanner.register c-scanner : include ; -type CPP : cpp cxx cc ; -type H : h ; -type HPP : hpp : H ; -type C : c ; +type.register CPP : cpp cxx cc ; +type.register H : h ; +type.register HPP : hpp : H ; +type.register C : c ; # It most cases where a CPP file or a H file is a source of some action, we # should rebuild the result if any of files included by CPP/H are changed. One diff --git a/v2/tools/types/objc.jam b/v2/tools/types/objc.jam index f8d31c072..709cbd0c7 100644 --- a/v2/tools/types/objc.jam +++ b/v2/tools/types/objc.jam @@ -20,7 +20,7 @@ class objc-scanner : c-scanner scanner.register objc-scanner : include ; -type OBJECTIVE_C : m ; -type OBJECTIVE_CPP : mm ; +type.register OBJECTIVE_C : m ; +type.register OBJECTIVE_CPP : mm ; type.set-scanner OBJECTIVE_C : objc-scanner ; type.set-scanner OBJECTIVE_CPP : objc-scanner ;