fixes for clang

This commit is contained in:
Ubuntu
2020-07-15 13:48:42 +00:00
parent 6d59e6ea90
commit 7fe9c3ccb1
7 changed files with 25 additions and 19 deletions
+5 -4
View File
@@ -27,8 +27,7 @@
#include <algorithm>
#include "ifc_parse_api.h"
#include "../ifcparse/IfcEntityList.h"
#include "../ifcparse/ArgumentType.h"
#include <boost/shared_ptr.hpp>
#include <boost/dynamic_bitset.hpp>
@@ -37,9 +36,11 @@ class Argument;
class IfcEntityList;
class IfcEntityListList;
class IfcEntityInstanceData;
namespace IfcParse {
class IfcFile;
}
namespace IfcUtil {
class IfcBaseClass;
@@ -61,11 +62,11 @@ public:
virtual operator std::vector<double>() const;
virtual operator std::vector<std::string>() const;
virtual operator std::vector<boost::dynamic_bitset<> >() const;
virtual operator IfcEntityList::ptr() const;
virtual operator boost::shared_ptr<IfcEntityList>() const;
virtual operator std::vector< std::vector<int> >() const;
virtual operator std::vector< std::vector<double> >() const;
virtual operator IfcEntityListList::ptr() const;
virtual operator boost::shared_ptr<IfcEntityListList>() const;
virtual bool isNull() const = 0;
virtual unsigned int size() const = 0;
+1 -2
View File
@@ -23,10 +23,9 @@
#include "ifc_parse_api.h"
#include "../ifcparse/IfcEntityInstanceData.h"
#include "../ifcparse/Argument.h"
#include "../ifcparse/IfcSchema.h"
class Argument;
namespace IfcUtil {
class IFC_PARSE_API IfcBaseClass {
+4 -1
View File
@@ -46,11 +46,14 @@
#include "../ifcparse/IfcBaseClass.h"
#include "../ifcparse/IfcLogger.h"
#include "../ifcparse/Argument.h"
#include "../ifcparse/IfcEntityList.h"
#include "../ifcparse/IfcSpfStream.h"
#if defined(__llvm__)
# define my_thread_local thread_local
#elif defined(__GNUC__)
/* gcc doesn't know _Thread_local from C11 yet */
#ifdef __GNUC__
# define my_thread_local __thread
#elif __STDC_VERSION__ >= 201112L
# define my_thread_local _Thread_local