r204261 - Add a new spelling for module map files 'module.modulemap'

[Ben Langmuir]

On Apr 14, 2014, at 11:13 AM, Nico Weber <thakis at chromium.org> wrote:

> http://clang.llvm.org/docs/Modules.html currently contains both "...Clang will also search for a file named module.map. This behavior is deprecated and we plan to eventually remove it." and "Where To Learn More About Modules...clang/lib/Headers/module.map" which I found a bit weird :-)

Fixed in r206431.

Ben

> 
> 
> On Mon, Apr 14, 2014 at 9:14 AM, Ben Langmuir <blangmuir at apple.com> wrote:
> Yes, although there is no immediate need to do so.
> 
> On Apr 14, 2014, at 7:24 AM, Nico Weber <thakis at chromium.org> wrote:
> 
>> Should tools/clang/lib/Headers/module.map be renamed to the new name?
>> 
>> 
>> On Thu, Mar 20, 2014 at 7:47 AM, Ben Langmuir <blangmuir at apple.com> wrote:
>> Thanks for letting me know.  Looks like Aaron Ballman already fixed this in r204345.
>> 
>> Be
>> 
>> On Mar 20, 2014, at 6:11 AM, Timur Iskhodzhanov <timurrrr at google.com> wrote:
>> 
>>> 
>>> 2014-03-20 0:23 GMT+04:00 Ben Langmuir <blangmuir at apple.com>:
>>>  bool HeaderSearch::loadModuleMapFile(const FileEntry *File, bool IsSystem) {
>>> +  switch (loadModuleMapFileImpl(File, IsSystem)) {
>>> +  case LMM_AlreadyLoaded:
>>> +  case LMM_NewlyLoaded:
>>> +    return false;
>>> +  case LMM_NoDirectory:
>>> +  case LMM_InvalidModuleMap:
>>> +    return true;
>>> +  }
>>> +}
>>> 
>>> FYI
>>> gcc-4.8.2 doesn't like it:
>>> ../tools/clang/lib/Lex/HeaderSearch.cpp: In member function ‘bool clang::HeaderSearch::loadModuleMapFile(const clang::FileEntry*, bool)’:
>>> ../tools/clang/lib/Lex/HeaderSearch.cpp:1159:1: warning: control reaches end of non-void function [-Wreturn-type]
>>>  }
>>>  ^
>> 
>> 
>> _______________________________________________
>> cfe-commits mailing list
>> cfe-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>> 
>> 
> 
> 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20140416/940e9249/attachment.html>