kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

+ move implementation of Base::ifstream and Base::ofstream to header and remove export macro.

Browse Source 
This is needed for VS 2013 to avoid that it exports methods of the base class and thus causing linker errors for modules that link FreeCADBase
This commit is contained in:
wmayer
2018-07-25 17:50:30 +02:00
parent 3b3e4fd4ce
commit 1fcfbcf1ab
2 changed files with 25 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Base/Stream.cpp
View File

@@ -39,7 +39,6 @@
#include "Stream.h"
#include "Swap.h"
#include "FileInfo.h"
#include <CXX/Objects.hxx>
using namespace Base;
@@ -785,32 +784,3 @@ Streambuf::seekpos(std::streambuf::pos_type pos,
{
return seekoff(pos, std::ios_base::beg);
}
// ---------------------------------------------------------
Base::ofstream::ofstream(const FileInfo& fi, ios_base::openmode mode)
#ifdef _MSC_VER
: std::ofstream(fi.toStdWString().c_str(), mode)
#else
: std::ofstream(fi.filePath().c_str(), mode)
#endif
{
}
Base::ofstream::~ofstream()
{
}
Base::ifstream::ifstream(const FileInfo& fi, ios_base::openmode mode)
#ifdef _MSC_VER
: std::ifstream(fi.toStdWString().c_str(), mode)
#else
: std::ifstream(fi.filePath().c_str(), mode)
#endif
{
}
Base::ifstream::~ifstream()
{
}

31
src/Base/Stream.h
View File

@@ -35,6 +35,7 @@
#include <sstream>
#include <string>
#include <vector>
#include "FileInfo.h"
class QByteArray;
class QIODevice;
@@ -302,12 +303,21 @@ class FileInfo;
* while on Linux platforms the file name is UTF-8 encoded.
* @author Werner Mayer
*/
class BaseExport ofstream : public std::ofstream
class ofstream : public std::ofstream
{
public:
ofstream(const FileInfo& fi, ios_base::openmode mode =
std::ios::out | std::ios::trunc);
virtual ~ofstream();
std::ios::out | std::ios::trunc)
#ifdef _MSC_VER
: std::ofstream(fi.toStdWString().c_str(), mode)
#else
: std::ofstream(fi.filePath().c_str(), mode)
#endif
{
}
virtual ~ofstream()
{
}
};
/**
@@ -316,12 +326,21 @@ public:
* while on Linux platforms the file name is UTF-8 encoded.
* @author Werner Mayer
*/
class BaseExport ifstream : public std::ifstream
class ifstream : public std::ifstream
{
public:
ifstream(const FileInfo& fi, ios_base::openmode mode =
std::ios::in);
virtual ~ifstream();
std::ios::in)
#ifdef _MSC_VER
: std::ifstream(fi.toStdWString().c_str(), mode)
#else
: std::ifstream(fi.filePath().c_str(), mode)
#endif
{
}
virtual ~ifstream()
{
}
};
} // namespace Base