Merge revision 1566 changes:

- Add <algorithm> include required by VS2013 (issue #1094).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1547@1569 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2014-01-14 02:52:34 +00:00
parent 0d3c66166d
commit a44c0da501
6 changed files with 15 additions and 6 deletions

View File

@ -10,6 +10,7 @@
// for more information.
//
#include <algorithm>
#include "libcef_dll/cpptoc/browser_cpptoc.h"
#include "libcef_dll/cpptoc/browser_host_cpptoc.h"
#include "libcef_dll/cpptoc/frame_cpptoc.h"

View File

@ -10,6 +10,7 @@
// for more information.
//
#include <algorithm>
#include "libcef_dll/cpptoc/post_data_cpptoc.h"
#include "libcef_dll/cpptoc/post_data_element_cpptoc.h"

View File

@ -10,6 +10,7 @@
// for more information.
//
#include <algorithm>
#include "libcef_dll/ctocpp/browser_ctocpp.h"
#include "libcef_dll/ctocpp/browser_host_ctocpp.h"
#include "libcef_dll/ctocpp/frame_ctocpp.h"

View File

@ -10,6 +10,7 @@
// for more information.
//
#include <algorithm>
#include "libcef_dll/ctocpp/post_data_ctocpp.h"
#include "libcef_dll/ctocpp/post_data_element_ctocpp.h"

View File

@ -3,7 +3,8 @@
// can be found in the LICENSE file.
#include "include/wrapper/cef_byte_read_handler.h"
#include <stdlib.h>
#include <algorithm>
#include <cstdlib>
#include "libcef_dll/cef_logging.h"
CefByteReadHandler::CefByteReadHandler(const unsigned char* bytes, size_t size,

View File

@ -270,6 +270,10 @@ def format_translation_includes(body):
"""
result = ''
# <algorithm> required for VS2013.
if body.find('std::min') > 0 or body.find('std::max') > 0:
result += '#include <algorithm>\n'
if body.find('cef_api_hash(') > 0:
result += '#include "include/cef_version.h"\n'