mirror of
https://github.com/pocoproject/poco.git
synced 2025-05-29 15:34:07 +02:00
GH #240: VERY strange error only when including Format.hinclude Alignment.h early
GH #240: VERY strange error only when including Format.h (include Alignment.h early for consistency)
This commit is contained in:
parent
20e1cf8821
commit
a49f5da54b
@ -54,6 +54,16 @@
|
||||
#define Foundation_AlignOf_INCLUDED
|
||||
|
||||
|
||||
#ifdef POCO_ENABLE_CPP11
|
||||
|
||||
|
||||
#include <type_traits>
|
||||
#define POCO_HAVE_ALIGNMENT
|
||||
|
||||
|
||||
#else
|
||||
|
||||
|
||||
namespace Poco {
|
||||
|
||||
|
||||
@ -245,4 +255,7 @@ template <size_t Alignment> struct AlignedCharArrayImpl;
|
||||
} // namespace Poco
|
||||
|
||||
|
||||
#endif // POCO_ENABLE_CPP11
|
||||
|
||||
|
||||
#endif // Foundation_AlignOf_INCLUDED
|
||||
|
@ -40,13 +40,10 @@
|
||||
|
||||
#include "Poco/Exception.h"
|
||||
#include "Poco/MetaProgramming.h"
|
||||
#include "Poco/Alignment.h"
|
||||
#include <algorithm>
|
||||
#include <typeinfo>
|
||||
#include <cstring>
|
||||
#ifdef POCO_ENABLE_CPP11
|
||||
#include <type_traits>
|
||||
#endif
|
||||
|
||||
|
||||
namespace Poco {
|
||||
|
||||
|
@ -129,6 +129,11 @@
|
||||
#endif
|
||||
|
||||
|
||||
//
|
||||
// Include alignment settings early
|
||||
//
|
||||
#include "Poco/Alignment.h"
|
||||
|
||||
//
|
||||
// Cleanup inconsistencies
|
||||
//
|
||||
|
@ -46,12 +46,6 @@
|
||||
#include "Poco/AutoPtr.h"
|
||||
#include "Poco/Exception.h"
|
||||
#include <vector>
|
||||
#ifdef POCO_ENABLE_CPP11
|
||||
#include <type_traits>
|
||||
#define POCO_HAVE_ALIGNMENT
|
||||
#else
|
||||
#include "Poco/Alignment.h"
|
||||
#endif
|
||||
|
||||
|
||||
namespace Poco {
|
||||
|
Loading…
x
Reference in New Issue
Block a user