mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision 40af916d (#303546).
- Standardize usage of virtual/override specifiers in CEF internals (see http://crbug.com/417463). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1903 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@ -36,8 +36,11 @@ def make_ctocpp_header(header, clsname):
|
||||
func_body = ''
|
||||
funcs = cls.get_virtual_funcs()
|
||||
for func in funcs:
|
||||
func_body += ' virtual '+func.get_cpp_proto()+' OVERRIDE;\n'
|
||||
|
||||
if clientside:
|
||||
func_body += ' '+func.get_cpp_proto()+' override;\n'
|
||||
else:
|
||||
func_body += ' virtual '+func.get_cpp_proto()+' OVERRIDE;\n'
|
||||
|
||||
# include standard headers
|
||||
if func_body.find('std::map') > 0 or func_body.find('std::multimap') > 0:
|
||||
result += '\n#include <map>'
|
||||
@ -70,8 +73,7 @@ def make_ctocpp_header(header, clsname):
|
||||
' : public CefCToCpp<'+clsname+'CToCpp, '+clsname+', '+capiname+'> {\n'+ \
|
||||
' public:\n'+ \
|
||||
' explicit '+clsname+'CToCpp('+capiname+'* str)\n'+ \
|
||||
' : CefCToCpp<'+clsname+'CToCpp, '+clsname+', '+capiname+'>(str) {}\n'+ \
|
||||
' virtual ~'+clsname+'CToCpp() {}\n\n'+ \
|
||||
' : CefCToCpp<'+clsname+'CToCpp, '+clsname+', '+capiname+'>(str) {}\n\n'+ \
|
||||
' // '+clsname+' methods\n';
|
||||
|
||||
result += func_body
|
||||
|
Reference in New Issue
Block a user