Add include guards for XMLConfiguration and JSONConfiguration in Poco::Util. This will prevent accidental linking of the XML and JSON libraries when enabled.

This commit is contained in:
Mike Naquin
2012-11-14 10:34:27 -06:00
parent 5f1d1b02e2
commit 6d586537bb
4 changed files with 28 additions and 0 deletions

View File

@@ -34,6 +34,11 @@
//
// Avoid accidental linking of JSON library when JSONConfiguration
// is not desired.
#ifndef POCO_UTIL_NO_JSONCONFIGURATION
#include "Poco/FileStream.h"
#include "Poco/StringTokenizer.h"
#include "Poco/Util/JSONConfiguration.h"
@@ -404,3 +409,5 @@ void JSONConfiguration::removeRaw(const std::string& key)
} } // namespace Poco::Util
#endif // POCO_UTIL_NO_JSONCONFIGURATION