Fix Linux compile errors.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@150 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
2025-06-05 21:39:12 +02:00 · 2010-12-07 01:30:26 +00:00
parent e826c9b1a0
commit 871a8a7770
54 changed files with 84 additions and 53 deletions
--- a/libcef_dll/cpptoc/browser_cpptoc.cc
+++ b/libcef_dll/cpptoc/browser_cpptoc.cc
@@ -264,6 +264,7 @@ CefBrowserCppToC::CefBrowserCppToC(CefBrowser* cls)
 }

 #ifdef _DEBUG
-long CefCppToC<CefBrowserCppToC, CefBrowser, cef_browser_t>::DebugObjCt = 0;
+template<> long CefCppToC<CefBrowserCppToC, CefBrowser,
+    cef_browser_t>::DebugObjCt = 0;
 #endif

--- a/libcef_dll/cpptoc/download_handler_cpptoc.cc
+++ b/libcef_dll/cpptoc/download_handler_cpptoc.cc
@@ -47,7 +47,7 @@ CefDownloadHandlerCppToC::CefDownloadHandlerCppToC(CefDownloadHandler* cls)
 }

 #ifdef _DEBUG
-long CefCppToC<CefDownloadHandlerCppToC, CefDownloadHandler,
+template<> long CefCppToC<CefDownloadHandlerCppToC, CefDownloadHandler,
    cef_download_handler_t>::DebugObjCt = 0;
 #endif

--- a/libcef_dll/cpptoc/frame_cpptoc.cc
+++ b/libcef_dll/cpptoc/frame_cpptoc.cc
@@ -240,6 +240,7 @@ CefFrameCppToC::CefFrameCppToC(CefFrame* cls)
 }

 #ifdef _DEBUG
-long CefCppToC<CefFrameCppToC, CefFrame, cef_frame_t>::DebugObjCt = 0;
+template<> long CefCppToC<CefFrameCppToC, CefFrame, cef_frame_t>::DebugObjCt =
+    0;
 #endif

--- a/libcef_dll/cpptoc/handler_cpptoc.cc
+++ b/libcef_dll/cpptoc/handler_cpptoc.cc
@@ -532,6 +532,7 @@ CefHandlerCppToC::CefHandlerCppToC(CefHandler* cls)
 }

 #ifdef _DEBUG
-long CefCppToC<CefHandlerCppToC, CefHandler, cef_handler_t>::DebugObjCt = 0;
+template<> long CefCppToC<CefHandlerCppToC, CefHandler,
+    cef_handler_t>::DebugObjCt = 0;
 #endif

--- a/libcef_dll/cpptoc/post_data_cpptoc.cc
+++ b/libcef_dll/cpptoc/post_data_cpptoc.cc
@@ -101,6 +101,7 @@ CefPostDataCppToC::CefPostDataCppToC(CefPostData* cls)
 }

 #ifdef _DEBUG
-long CefCppToC<CefPostDataCppToC, CefPostData, cef_post_data_t>::DebugObjCt = 0;
+template<> long CefCppToC<CefPostDataCppToC, CefPostData,
+    cef_post_data_t>::DebugObjCt = 0;
 #endif

--- a/libcef_dll/cpptoc/post_data_element_cpptoc.cc
+++ b/libcef_dll/cpptoc/post_data_element_cpptoc.cc
@@ -115,7 +115,7 @@ CefPostDataElementCppToC::CefPostDataElementCppToC(CefPostDataElement* cls)
 }

 #ifdef _DEBUG
-long CefCppToC<CefPostDataElementCppToC, CefPostDataElement,
+template<> long CefCppToC<CefPostDataElementCppToC, CefPostDataElement,
    cef_post_data_element_t>::DebugObjCt = 0;
 #endif

--- a/libcef_dll/cpptoc/read_handler_cpptoc.cc
+++ b/libcef_dll/cpptoc/read_handler_cpptoc.cc
@@ -66,7 +66,7 @@ CefReadHandlerCppToC::CefReadHandlerCppToC(CefReadHandler* cls)
 }

 #ifdef _DEBUG
-long CefCppToC<CefReadHandlerCppToC, CefReadHandler,
+template<> long CefCppToC<CefReadHandlerCppToC, CefReadHandler,
    cef_read_handler_t>::DebugObjCt = 0;
 #endif

--- a/libcef_dll/cpptoc/request_cpptoc.cc
+++ b/libcef_dll/cpptoc/request_cpptoc.cc
@@ -162,6 +162,7 @@ CefRequestCppToC::CefRequestCppToC(CefRequest* cls)
 }

 #ifdef _DEBUG
-long CefCppToC<CefRequestCppToC, CefRequest, cef_request_t>::DebugObjCt = 0;
+template<> long CefCppToC<CefRequestCppToC, CefRequest,
+    cef_request_t>::DebugObjCt = 0;
 #endif

--- a/libcef_dll/cpptoc/scheme_handler_cpptoc.cc
+++ b/libcef_dll/cpptoc/scheme_handler_cpptoc.cc
@@ -70,7 +70,7 @@ CefSchemeHandlerCppToC::CefSchemeHandlerCppToC(CefSchemeHandler* cls)
 }

 #ifdef _DEBUG
-long CefCppToC<CefSchemeHandlerCppToC, CefSchemeHandler,
+template<> long CefCppToC<CefSchemeHandlerCppToC, CefSchemeHandler,
    cef_scheme_handler_t>::DebugObjCt = 0;
 #endif

--- a/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc
+++ b/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc
@@ -37,7 +37,7 @@ CefSchemeHandlerFactoryCppToC::CefSchemeHandlerFactoryCppToC(
 }

 #ifdef _DEBUG
-long CefCppToC<CefSchemeHandlerFactoryCppToC, CefSchemeHandlerFactory,
-    cef_scheme_handler_factory_t>::DebugObjCt = 0;
+template<> long CefCppToC<CefSchemeHandlerFactoryCppToC,
+    CefSchemeHandlerFactory, cef_scheme_handler_factory_t>::DebugObjCt = 0;
 #endif

--- a/libcef_dll/cpptoc/stream_reader_cpptoc.cc
+++ b/libcef_dll/cpptoc/stream_reader_cpptoc.cc
@@ -100,7 +100,7 @@ CefStreamReaderCppToC::CefStreamReaderCppToC(CefStreamReader* cls)
 }

 #ifdef _DEBUG
-long CefCppToC<CefStreamReaderCppToC, CefStreamReader,
+template<> long CefCppToC<CefStreamReaderCppToC, CefStreamReader,
    cef_stream_reader_t>::DebugObjCt = 0;
 #endif

--- a/libcef_dll/cpptoc/stream_writer_cpptoc.cc
+++ b/libcef_dll/cpptoc/stream_writer_cpptoc.cc
@@ -99,7 +99,7 @@ CefStreamWriterCppToC::CefStreamWriterCppToC(CefStreamWriter* cls)
 }

 #ifdef _DEBUG
-long CefCppToC<CefStreamWriterCppToC, CefStreamWriter,
+template<> long CefCppToC<CefStreamWriterCppToC, CefStreamWriter,
    cef_stream_writer_t>::DebugObjCt = 0;
 #endif

--- a/libcef_dll/cpptoc/task_cpptoc.cc
+++ b/libcef_dll/cpptoc/task_cpptoc.cc
@@ -35,6 +35,6 @@ CefTaskCppToC::CefTaskCppToC(CefTask* cls)
 }

 #ifdef _DEBUG
-long CefCppToC<CefTaskCppToC, CefTask, cef_task_t>::DebugObjCt = 0;
+template<> long CefCppToC<CefTaskCppToC, CefTask, cef_task_t>::DebugObjCt = 0;
 #endif

--- a/libcef_dll/cpptoc/v8handler_cpptoc.cc
+++ b/libcef_dll/cpptoc/v8handler_cpptoc.cc
@@ -56,7 +56,7 @@ CefV8HandlerCppToC::CefV8HandlerCppToC(CefV8Handler* cls)
 }

 #ifdef _DEBUG
-long CefCppToC<CefV8HandlerCppToC, CefV8Handler, cef_v8handler_t>::DebugObjCt =
-    0;
+template<> long CefCppToC<CefV8HandlerCppToC, CefV8Handler,
+    cef_v8handler_t>::DebugObjCt = 0;
 #endif

--- a/libcef_dll/cpptoc/v8value_cpptoc.cc
+++ b/libcef_dll/cpptoc/v8value_cpptoc.cc
@@ -430,6 +430,7 @@ CefV8ValueCppToC::CefV8ValueCppToC(CefV8Value* cls)
 }

 #ifdef _DEBUG
-long CefCppToC<CefV8ValueCppToC, CefV8Value, cef_v8value_t>::DebugObjCt = 0;
+template<> long CefCppToC<CefV8ValueCppToC, CefV8Value,
+    cef_v8value_t>::DebugObjCt = 0;
 #endif

--- a/libcef_dll/cpptoc/write_handler_cpptoc.cc
+++ b/libcef_dll/cpptoc/write_handler_cpptoc.cc
@@ -67,7 +67,7 @@ CefWriteHandlerCppToC::CefWriteHandlerCppToC(CefWriteHandler* cls)
 }

 #ifdef _DEBUG
-long CefCppToC<CefWriteHandlerCppToC, CefWriteHandler,
+template<> long CefCppToC<CefWriteHandlerCppToC, CefWriteHandler,
    cef_write_handler_t>::DebugObjCt = 0;
 #endif

--- a/libcef_dll/cpptoc/xml_reader_cpptoc.cc
+++ b/libcef_dll/cpptoc/xml_reader_cpptoc.cc
@@ -378,7 +378,7 @@ CefXmlReaderCppToC::CefXmlReaderCppToC(CefXmlReader* cls)
 }

 #ifdef _DEBUG
-long CefCppToC<CefXmlReaderCppToC, CefXmlReader, cef_xml_reader_t>::DebugObjCt =
-    0;
+template<> long CefCppToC<CefXmlReaderCppToC, CefXmlReader,
+    cef_xml_reader_t>::DebugObjCt = 0;
 #endif

--- a/libcef_dll/cpptoc/zip_reader_cpptoc.cc
+++ b/libcef_dll/cpptoc/zip_reader_cpptoc.cc
@@ -166,7 +166,7 @@ CefZipReaderCppToC::CefZipReaderCppToC(CefZipReader* cls)
 }

 #ifdef _DEBUG
-long CefCppToC<CefZipReaderCppToC, CefZipReader, cef_zip_reader_t>::DebugObjCt =
-    0;
+template<> long CefCppToC<CefZipReaderCppToC, CefZipReader,
+    cef_zip_reader_t>::DebugObjCt = 0;
 #endif