Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
googletest
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
googletest
Commits
b7cf4414
Commit
b7cf4414
authored
May 04, 2017
by
Victor Costan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pick up GTEST_API_ definition in gtest/internal/custom/gtest-port.h.
This makes it possible for a port to define the specifier used for exported symbols without having to change Google Test.
parent
0ad83afd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
gtest-port.h
googletest/include/gtest/internal/custom/gtest-port.h
+3
-0
gtest-port.h
googletest/include/gtest/internal/gtest-port.h
+8
-1
No files found.
googletest/include/gtest/internal/custom/gtest-port.h
View file @
b7cf4414
...
@@ -61,6 +61,9 @@
...
@@ -61,6 +61,9 @@
// GTEST_EXCLUSIVE_LOCK_REQUIRED_(locks)
// GTEST_EXCLUSIVE_LOCK_REQUIRED_(locks)
// GTEST_LOCK_EXCLUDED_(locks)
// GTEST_LOCK_EXCLUDED_(locks)
//
//
// Exporting API symbols:
// GTEST_API_ - Specifier for exported symbols.
//
// ** Custom implementation starts here **
// ** Custom implementation starts here **
#ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
#ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
...
...
googletest/include/gtest/internal/gtest-port.h
View file @
b7cf4414
...
@@ -930,6 +930,11 @@ using ::std::tuple_size;
...
@@ -930,6 +930,11 @@ using ::std::tuple_size;
#endif // GTEST_HAS_SEH
#endif // GTEST_HAS_SEH
// GTEST_API_ qualifies all symbols that must be exported. The definitions below
// are guarded by #ifndef to give embedders a chance to define GTEST_API_ in
// gtest/internal/custom/gtest-port.h
#ifndef GTEST_API_
#ifdef _MSC_VER
#ifdef _MSC_VER
# if GTEST_LINKED_AS_SHARED_LIBRARY
# if GTEST_LINKED_AS_SHARED_LIBRARY
# define GTEST_API_ __declspec(dllimport)
# define GTEST_API_ __declspec(dllimport)
...
@@ -940,9 +945,11 @@ using ::std::tuple_size;
...
@@ -940,9 +945,11 @@ using ::std::tuple_size;
# define GTEST_API_ __attribute__((visibility ("default")))
# define GTEST_API_ __attribute__((visibility ("default")))
#endif // _MSC_VER
#endif // _MSC_VER
#endif // GTEST_API_
#ifndef GTEST_API_
#ifndef GTEST_API_
# define GTEST_API_
# define GTEST_API_
#endif
#endif
// GTEST_API_
#ifdef __GNUC__
#ifdef __GNUC__
// Ask the compiler to never inline a given function.
// Ask the compiler to never inline a given function.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment