generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #887 from LeszekSwirski:fix-glinkedptrmutex

Browse Source
This commit is contained in:
Roman Donchenko 2013-05-22 12:57:04 +04:00 committed by OpenCV Buildbot
commit 7efb24917f
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/ts/include/opencv2/ts.hpp
View File

@ -4,6 +4,14 @@
#include "opencv2/core/cvdef.h" #include "opencv2/core/cvdef.h"
#include <stdarg.h> // for va_list #include <stdarg.h> // for va_list
#include "cvconfig.h"
#ifndef GTEST_CREATE_SHARED_LIBRARY
#ifdef BUILD_SHARED_LIBS
#define GTEST_LINKED_AS_SHARED_LIBRARY 1
#endif
#endif
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning( disable: 4127 ) #pragma warning( disable: 4127 )
#endif #endif

14
modules/ts/include/opencv2/ts/ts_gtest.h
View File

@ -1912,7 +1912,19 @@ using ::std::tuple_size;
#endif // GTEST_HAS_SEH #endif // GTEST_HAS_SEH
#define GTEST_API_ CV_EXPORTS #ifdef _MSC_VER
# if GTEST_LINKED_AS_SHARED_LIBRARY
# define GTEST_API_ __declspec(dllimport)
# elif GTEST_CREATE_SHARED_LIBRARY
# define GTEST_API_ __declspec(dllexport)
# endif
#endif // _MSC_VER
#ifndef GTEST_API_
# define GTEST_API_ CV_EXPORTS
#endif
#ifdef __GNUC__ #ifdef __GNUC__
// Ask the compiler to never inline a given function. // Ask the compiler to never inline a given function.

8
modules/ts/include/opencv2/ts/ts_perf.hpp
View File

@ -1,6 +1,14 @@
#ifndef __OPENCV_TS_PERF_HPP__ #ifndef __OPENCV_TS_PERF_HPP__
#define __OPENCV_TS_PERF_HPP__ #define __OPENCV_TS_PERF_HPP__
#include "cvconfig.h"
#ifndef GTEST_CREATE_SHARED_LIBRARY
# ifdef BUILD_SHARED_LIBS
# define GTEST_LINKED_AS_SHARED_LIBRARY 1
# endif
#endif
#include "opencv2/core.hpp" #include "opencv2/core.hpp"
#include "ts_gtest.h" #include "ts_gtest.h"