From cfd30d903dd77c6c46ffa2aa736968040b0eb558 Mon Sep 17 00:00:00 2001 From: Arseny Kapoulkine Date: Tue, 25 Feb 2014 03:52:10 +0000 Subject: Revert automatic support for header-only mode since it creates problems with qmake. Qmake treats all files that are #include-d as header files, even if the #include is guarded by an #ifdef. It looks like the only solution that allows for transparent header-only support based on preprocessor define involves moving the actual source into a separate header file and including this file in pugixml.cpp. Let's not do it yet. git-svn-id: https://pugixml.googlecode.com/svn/trunk@990 99668b35-9821-0410-8761-19e4c4f06640 --- src/pugiconfig.hpp | 1 + src/pugixml.hpp | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/pugiconfig.hpp b/src/pugiconfig.hpp index ffa323a..56f1d22 100644 --- a/src/pugiconfig.hpp +++ b/src/pugiconfig.hpp @@ -39,6 +39,7 @@ // Uncomment this to switch to header-only version // #define PUGIXML_HEADER_ONLY +// #include "pugixml.cpp" // Uncomment this to enable long long support // #define PUGIXML_HAS_LONG_LONG diff --git a/src/pugixml.hpp b/src/pugixml.hpp index b912127..6fb99be 100644 --- a/src/pugixml.hpp +++ b/src/pugixml.hpp @@ -1306,11 +1306,6 @@ namespace std #endif -// Make sure implementation is included in header-only mode -#ifdef PUGIXML_HEADER_ONLY -# include "pugixml.cpp" -#endif - /** * Copyright (c) 2006-2014 Arseny Kapoulkine * -- cgit v1.2.3