fix warnings and errors in test compiles with BUILD_SHARED_LIBS

This commit is contained in:
Andreas Schönle 2017-04-28 00:11:02 +02:00
parent 18368ca5ac
commit f0683ecbc9
5 changed files with 22 additions and 18 deletions

View File

@ -67,7 +67,7 @@ struct ConvertToIntImpl<T, true> {
}; };
// Write the content of w to os. // Write the content of w to os.
void write(std::ostream &os, Writer &w); FMT_API void write(std::ostream &os, Writer &w);
#if FMT_HAS_DECLTYPE_INCOMPLETE_RETURN_TYPES #if FMT_HAS_DECLTYPE_INCOMPLETE_RETURN_TYPES
template<typename T> template<typename T>

View File

@ -91,7 +91,7 @@ class BufferedFile {
BufferedFile() FMT_NOEXCEPT : file_(FMT_NULL) {} BufferedFile() FMT_NOEXCEPT : file_(FMT_NULL) {}
// Destroys the object closing the file it represents if any. // Destroys the object closing the file it represents if any.
~BufferedFile() FMT_NOEXCEPT; FMT_API ~BufferedFile() FMT_NOEXCEPT;
#if !FMT_USE_RVALUE_REFERENCES #if !FMT_USE_RVALUE_REFERENCES
// Emulate a move constructor and a move assignment operator if rvalue // Emulate a move constructor and a move assignment operator if rvalue
@ -154,17 +154,17 @@ public:
#endif #endif
// Opens a file. // Opens a file.
BufferedFile(CStringRef filename, CStringRef mode); FMT_API BufferedFile(CStringRef filename, CStringRef mode);
// Closes the file. // Closes the file.
void close(); FMT_API void close();
// Returns the pointer to a FILE object representing this file. // Returns the pointer to a FILE object representing this file.
FILE *get() const FMT_NOEXCEPT { return file_; } FILE *get() const FMT_NOEXCEPT { return file_; }
// We place parentheses around fileno to workaround a bug in some versions // We place parentheses around fileno to workaround a bug in some versions
// of MinGW that define fileno as a macro. // of MinGW that define fileno as a macro.
int (fileno)() const; FMT_API int (fileno)() const;
void print(CStringRef format_str, const ArgList &args) { void print(CStringRef format_str, const ArgList &args) {
fmt::print(file_, format_str, args); fmt::print(file_, format_str, args);
@ -197,7 +197,7 @@ class File {
File() FMT_NOEXCEPT : fd_(-1) {} File() FMT_NOEXCEPT : fd_(-1) {}
// Opens a file and constructs a File object representing this file. // Opens a file and constructs a File object representing this file.
File(CStringRef path, int oflag); FMT_API File(CStringRef path, int oflag);
#if !FMT_USE_RVALUE_REFERENCES #if !FMT_USE_RVALUE_REFERENCES
// Emulate a move constructor and a move assignment operator if rvalue // Emulate a move constructor and a move assignment operator if rvalue
@ -260,43 +260,43 @@ class File {
#endif #endif
// Destroys the object closing the file it represents if any. // Destroys the object closing the file it represents if any.
~File() FMT_NOEXCEPT; FMT_API ~File() FMT_NOEXCEPT;
// Returns the file descriptor. // Returns the file descriptor.
int descriptor() const FMT_NOEXCEPT { return fd_; } int descriptor() const FMT_NOEXCEPT { return fd_; }
// Closes the file. // Closes the file.
void close(); FMT_API void close();
// Returns the file size. The size has signed type for consistency with // Returns the file size. The size has signed type for consistency with
// stat::st_size. // stat::st_size.
LongLong size() const; FMT_API LongLong size() const;
// Attempts to read count bytes from the file into the specified buffer. // Attempts to read count bytes from the file into the specified buffer.
std::size_t read(void *buffer, std::size_t count); FMT_API std::size_t read(void *buffer, std::size_t count);
// Attempts to write count bytes from the specified buffer to the file. // Attempts to write count bytes from the specified buffer to the file.
std::size_t write(const void *buffer, std::size_t count); FMT_API std::size_t write(const void *buffer, std::size_t count);
// Duplicates a file descriptor with the dup function and returns // Duplicates a file descriptor with the dup function and returns
// the duplicate as a file object. // the duplicate as a file object.
static File dup(int fd); FMT_API static File dup(int fd);
// Makes fd be the copy of this file descriptor, closing fd first if // Makes fd be the copy of this file descriptor, closing fd first if
// necessary. // necessary.
void dup2(int fd); FMT_API void dup2(int fd);
// Makes fd be the copy of this file descriptor, closing fd first if // Makes fd be the copy of this file descriptor, closing fd first if
// necessary. // necessary.
void dup2(int fd, ErrorCode &ec) FMT_NOEXCEPT; FMT_API void dup2(int fd, ErrorCode &ec) FMT_NOEXCEPT;
// Creates a pipe setting up read_end and write_end file objects for reading // Creates a pipe setting up read_end and write_end file objects for reading
// and writing respectively. // and writing respectively.
static void pipe(File &read_end, File &write_end); FMT_API static void pipe(File &read_end, File &write_end);
// Creates a BufferedFile object associated with this file and detaches // Creates a BufferedFile object associated with this file and detaches
// this File object from the file. // this File object from the file.
BufferedFile fdopen(const char *mode); FMT_API BufferedFile fdopen(const char *mode);
}; };
// Returns the memory page size. // Returns the memory page size.

View File

@ -26,6 +26,7 @@
*/ */
#define FMT_NOEXCEPT #define FMT_NOEXCEPT
#undef FMT_SHARED
#include "test-assert.h" #include "test-assert.h"
// Include *.cc instead of *.h to test implementation-specific stuff. // Include *.cc instead of *.h to test implementation-specific stuff.

View File

@ -1556,8 +1556,8 @@ TEST(FormatTest, JoinArg) {
using fmt::join; using fmt::join;
int v1[3] = { 1, 2, 3 }; int v1[3] = { 1, 2, 3 };
std::vector<float> v2; std::vector<float> v2;
v2.push_back(1.2); v2.push_back(1.2f);
v2.push_back(3.4); v2.push_back(3.4f);
EXPECT_EQ("(1, 2, 3)", format("({})", join(v1 + 0, v1 + 3, ", "))); EXPECT_EQ("(1, 2, 3)", format("({})", join(v1 + 0, v1 + 3, ", ")));
EXPECT_EQ("(1)", format("({})", join(v1 + 0, v1 + 1, ", "))); EXPECT_EQ("(1)", format("({})", join(v1 + 0, v1 + 1, ", ")));

View File

@ -6,6 +6,9 @@
For the license information refer to format.h. For the license information refer to format.h.
*/ */
#ifdef WIN32
#define _CRT_SECURE_NO_WARNINGS
#endif
#include "gmock/gmock.h" #include "gmock/gmock.h"
#include "fmt/time.h" #include "fmt/time.h"