bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libcef_dll_wrapper: 

- Include cef_logging.h instead of base/logging.h to avoid link errors.

cefclient:
- Remove duplicate definition of the min macro.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@132 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2010-11-02 19:57:19 +00:00
parent 737be028e5
commit a86735b71e
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libcef_dll/wrapper/cef_xml_object.cc
View File

@ -3,7 +3,8 @@
// can be found in the LICENSE file. // can be found in the LICENSE file.
#include "include/cef_wrapper.h" #include "include/cef_wrapper.h"
#include "base/logging.h" #include "libcef_dll/cef_logging.h"
#include <sstream>
namespace { namespace {
@ -103,7 +104,7 @@ public:
cur_object->GetName() != reader->GetQualifiedName()) { cur_object->GetName() != reader->GetQualifiedName()) {
// Open tag without close tag or close tag without open tag should // Open tag without close tag or close tag without open tag should
// never occur (the parser catches this error). // never occur (the parser catches this error).
NOTREACHED(); DCHECK(FALSE);
std::wstringstream ss; std::wstringstream ss;
ss << L"Mismatched end tag for " << cur_object->GetName() << ss << L"Mismatched end tag for " << cur_object->GetName() <<
L", line " << reader->GetLineNumber(); L", line " << reader->GetLineNumber();

2
libcef_dll/wrapper/cef_zip_archive.cc
View File

@ -3,7 +3,7 @@
// can be found in the LICENSE file. // can be found in the LICENSE file.
#include "include/cef_wrapper.h" #include "include/cef_wrapper.h"
#include "base/logging.h" #include "libcef_dll/cef_logging.h"
#include <algorithm> #include <algorithm>
namespace { namespace {

4
tests/cefclient/util.h
View File

@ -44,8 +44,4 @@
#endif // _WIN32 #endif // _WIN32
#ifndef min
#define min(a,b) ((a)<(b)?(a):(b))
#endif
#endif // _CEFCLIENT_UTIL_H #endif // _CEFCLIENT_UTIL_H