[App] sort includes in PreCompiled.h
- also remove a superfluous private: statement - also remove an unnecessary include
This commit is contained in:
@@ -65,7 +65,6 @@ public:
|
||||
private:
|
||||
static void init();
|
||||
|
||||
private:
|
||||
struct LicenseItem{
|
||||
std::string license;
|
||||
std::string url;
|
||||
|
||||
@@ -23,14 +23,11 @@
|
||||
#include "PreCompiled.h"
|
||||
|
||||
#ifndef _PreComp_
|
||||
#include <boost/core/ignore_unused.hpp>
|
||||
#include <memory>
|
||||
#include <sstream>
|
||||
# include <boost/core/ignore_unused.hpp>
|
||||
# include <memory>
|
||||
# include <sstream>
|
||||
#endif
|
||||
|
||||
#include "Metadata.h"
|
||||
|
||||
#include <utility>
|
||||
#include <xercesc/framework/LocalFileFormatTarget.hpp>
|
||||
#include <xercesc/framework/LocalFileInputSource.hpp>
|
||||
#include <xercesc/framework/MemBufInputSource.hpp>
|
||||
@@ -40,6 +37,9 @@
|
||||
#include "App/Expression.h"
|
||||
#include "Base/XMLTools.h"
|
||||
|
||||
#include "Metadata.h"
|
||||
|
||||
|
||||
/*
|
||||
*** From GCC: ***
|
||||
In the GNU C Library, "major" and "minor" are defined
|
||||
|
||||
@@ -21,11 +21,10 @@
|
||||
* *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#include "PreCompiled.h"
|
||||
|
||||
#ifndef _PreComp_
|
||||
#include <string>
|
||||
# include <string>
|
||||
#endif
|
||||
|
||||
#include <App/Document.h>
|
||||
@@ -37,7 +36,7 @@
|
||||
|
||||
|
||||
#ifndef M_PI
|
||||
#define M_PI 3.14159265358979323846
|
||||
# define M_PI 3.14159265358979323846
|
||||
#endif
|
||||
|
||||
using namespace App;
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
* *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#ifndef APP_PRECOMPILED_H
|
||||
#define APP_PRECOMPILED_H
|
||||
|
||||
@@ -36,7 +35,6 @@
|
||||
#pragma warning( disable : 4786 ) // specifier longer then 255 chars
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef FC_OS_WIN32
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#ifndef NOMINMAX
|
||||
@@ -47,21 +45,21 @@
|
||||
#ifdef _PreComp_
|
||||
|
||||
// standard
|
||||
#include <cstdio>
|
||||
#include <cassert>
|
||||
#include <ctime>
|
||||
#include <csignal>
|
||||
#include <cstdio>
|
||||
#include <ctime>
|
||||
|
||||
#ifdef FC_OS_WIN32
|
||||
#include <direct.h>
|
||||
#include <windows.h>
|
||||
#include <crtdbg.h>
|
||||
# include <crtdbg.h>
|
||||
# include <direct.h>
|
||||
# include <windows.h>
|
||||
#endif
|
||||
|
||||
#if defined(FC_OS_LINUX) || defined(FC_OS_MACOSX) || defined(FC_OS_BSD)
|
||||
#include <unistd.h>
|
||||
#include <pwd.h>
|
||||
#include <sys/types.h>
|
||||
# include <pwd.h>
|
||||
# include <unistd.h>
|
||||
# include <sys/types.h>
|
||||
#endif
|
||||
|
||||
// Streams
|
||||
@@ -69,37 +67,36 @@
|
||||
#include <sstream>
|
||||
|
||||
// STL
|
||||
#include <string>
|
||||
#include <list>
|
||||
#include <map>
|
||||
#include <vector>
|
||||
#include <set>
|
||||
#include <stack>
|
||||
#include <queue>
|
||||
#include <bitset>
|
||||
#include <exception>
|
||||
#include <random>
|
||||
#include <unordered_set>
|
||||
#include <unordered_map>
|
||||
#include <iterator>
|
||||
#include <functional>
|
||||
#include <iterator>
|
||||
#include <list>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <queue>
|
||||
#include <random>
|
||||
#include <set>
|
||||
#include <stack>
|
||||
#include <string>
|
||||
#include <tuple>
|
||||
#include <unordered_map>
|
||||
#include <unordered_set>
|
||||
#include <vector>
|
||||
|
||||
// Boost
|
||||
#include <boost_signals2.hpp>
|
||||
#include <boost/bind/bind.hpp>
|
||||
#include <boost/core/ignore_unused.hpp>
|
||||
#include <boost/regex.hpp>
|
||||
|
||||
#include <boost/utility.hpp>
|
||||
#include <boost_graph_adjacency_list.hpp>
|
||||
#include <boost/date_time/posix_time/posix_time.hpp>
|
||||
#include <boost_signals2.hpp>
|
||||
|
||||
#include <boost/program_options.hpp>
|
||||
|
||||
#include <boost/filesystem/path.hpp>
|
||||
#include <boost/filesystem/operations.hpp>
|
||||
#include <boost/regex.hpp>
|
||||
#include <boost/utility.hpp>
|
||||
#include <boost/bind/bind.hpp>
|
||||
#include <boost/core/ignore_unused.hpp>
|
||||
#include <boost/date_time/posix_time/posix_time.hpp>
|
||||
#include <boost/filesystem/exception.hpp>
|
||||
#include <boost/filesystem/operations.hpp>
|
||||
#include <boost/filesystem/path.hpp>
|
||||
|
||||
#endif //_PreComp_
|
||||
|
||||
|
||||
Reference in New Issue
Block a user