"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "googlemock/src/gmock_main.cc" between
googletest-release-1.11.0.tar.gz and googletest-release-1.12.0.tar.gz

About: GoogleTest is Google's (unit) testing and mocking framework for C++ tests.

gmock_main.cc  (googletest-release-1.11.0)	:	gmock_main.cc  (googletest-release-1.12.0)
skipping to change at line 31		skipping to change at line 31
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT		// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,		// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT		// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,		// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY		// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT		// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE		// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.		// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <iostream>		#include <iostream>
#include "gmock/gmock.h"		#include "gmock/gmock.h"
#include "gtest/gtest.h"		#include "gtest/gtest.h"
#if GTEST_OS_ESP8266 || GTEST_OS_ESP32		#if GTEST_OS_ESP8266 || GTEST_OS_ESP32
#if GTEST_OS_ESP8266		#if GTEST_OS_ESP8266
extern "C" {		extern "C" {
#endif		#endif
void setup() {		void setup() {
// Since Google Mock depends on Google Test, InitGoogleMock() is		// Since Google Mock depends on Google Test, InitGoogleMock() is
// also responsible for initializing Google Test. Therefore there's		// also responsible for initializing Google Test. Therefore there's
skipping to change at line 58		skipping to change at line 59
#else		#else
// MS C++ compiler/linker has a bug on Windows (not on Windows CE), which		// MS C++ compiler/linker has a bug on Windows (not on Windows CE), which
// causes a link error when _tmain is defined in a static library and UNICODE		// causes a link error when _tmain is defined in a static library and UNICODE
// is enabled. For this reason instead of _tmain, main function is used on		// is enabled. For this reason instead of _tmain, main function is used on
// Windows. See the following link to track the current status of this bug:		// Windows. See the following link to track the current status of this bug:
// https://web.archive.org/web/20170912203238/connect.microsoft.com/VisualStudio /feedback/details/394464/wmain-link-error-in-the-static-library		// https://web.archive.org/web/20170912203238/connect.microsoft.com/VisualStudio /feedback/details/394464/wmain-link-error-in-the-static-library
// // NOLINT		// // NOLINT
#if GTEST_OS_WINDOWS_MOBILE		#if GTEST_OS_WINDOWS_MOBILE
# include <tchar.h> // NOLINT		#include <tchar.h> // NOLINT
GTEST_API_ int _tmain(int argc, TCHAR** argv) {		GTEST_API_ int _tmain(int argc, TCHAR** argv) {
#else		#else
GTEST_API_ int main(int argc, char** argv) {		GTEST_API_ int main(int argc, char** argv) {
#endif // GTEST_OS_WINDOWS_MOBILE		#endif // GTEST_OS_WINDOWS_MOBILE
std::cout << "Running main() from gmock_main.cc\n";		std::cout << "Running main() from gmock_main.cc\n";
// Since Google Mock depends on Google Test, InitGoogleMock() is		// Since Google Mock depends on Google Test, InitGoogleMock() is
// also responsible for initializing Google Test. Therefore there's		// also responsible for initializing Google Test. Therefore there's
// no need for calling testing::InitGoogleTest() separately.		// no need for calling testing::InitGoogleTest() separately.
testing::InitGoogleMock(&argc, argv);		testing::InitGoogleMock(&argc, argv);
End of changes. 2 change blocks.
1 lines changed or deleted		2 lines changed or added

---