qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From astitc...@apache.org
Subject svn commit: r1494316 - in /qpid/trunk/qpid/cpp/src: CMakeLists.txt qpid/SaslFactory.cpp qpid/Version.h qpid/broker/SaslAuthenticator.cpp qpid/client/ConnectionImpl.cpp qpid/client/LoadPlugins.cpp
Date Tue, 18 Jun 2013 21:29:16 GMT
Author: astitcher
Date: Tue Jun 18 21:29:16 2013
New Revision: 1494316

URL: http://svn.apache.org/r1494316
Log:
NO-JIRA: Remove useless HAVE_CONFIG_H definition

Modified:
    qpid/trunk/qpid/cpp/src/CMakeLists.txt
    qpid/trunk/qpid/cpp/src/qpid/SaslFactory.cpp
    qpid/trunk/qpid/cpp/src/qpid/Version.h
    qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp
    qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.cpp
    qpid/trunk/qpid/cpp/src/qpid/client/LoadPlugins.cpp

Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1494316&r1=1494315&r2=1494316&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Tue Jun 18 21:29:16 2013
@@ -1526,11 +1526,6 @@ install_pdb (qmfconsole ${QPID_COMPONENT
 #
 include (legacystore.cmake)
 
-# This is only really needed until all the trunk builds (Linux, UNIX, Windows)
-# are all on cmake only. This is because cmake builds always have a config.h
-# file whereas older builds only have config.h on autoconf-generated builds.
-add_definitions(-DHAVE_CONFIG_H)
-
 # Now create the config file from all the info learned above.
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
                ${CMAKE_CURRENT_BINARY_DIR}/config.h)

Modified: qpid/trunk/qpid/cpp/src/qpid/SaslFactory.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/SaslFactory.cpp?rev=1494316&r1=1494315&r2=1494316&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/SaslFactory.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/SaslFactory.cpp Tue Jun 18 21:29:16 2013
@@ -24,9 +24,7 @@
 #include <map>
 #include <string.h>
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
+#include "config.h"
 
 #ifndef HAVE_SASL
 

Modified: qpid/trunk/qpid/cpp/src/qpid/Version.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/Version.h?rev=1494316&r1=1494315&r2=1494316&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/Version.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/Version.h Tue Jun 18 21:29:16 2013
@@ -21,11 +21,7 @@
 
 #include <string>
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#else
-#  error "config.h not generated"
-#endif
+#include "config.h"
 
 namespace qpid {
   const std::string product  = PACKAGE_NAME;

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp?rev=1494316&r1=1494315&r2=1494316&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp Tue Jun 18 21:29:16 2013
@@ -19,10 +19,6 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include "qpid/broker/AclModule.h"
 #include "qpid/broker/Broker.h"
 #include "qpid/broker/Connection.h"
@@ -30,8 +26,11 @@
 #include "qpid/framing/reply_exceptions.h"
 #include "qpid/framing/FieldValue.h"
 #include "qpid/sys/SecuritySettings.h"
+
 #include <boost/format.hpp>
 
+#include "config.h"
+
 #if HAVE_SASL
 #include <sys/stat.h>
 #include <sasl/sasl.h>

Modified: qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.cpp?rev=1494316&r1=1494315&r2=1494316&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.cpp Tue Jun 18 21:29:16 2013
@@ -42,9 +42,7 @@
 #include <limits>
 #include <vector>
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
+#include "config.h"
 
 namespace qpid {
 namespace client {

Modified: qpid/trunk/qpid/cpp/src/qpid/client/LoadPlugins.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/LoadPlugins.cpp?rev=1494316&r1=1494315&r2=1494316&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/LoadPlugins.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/LoadPlugins.cpp Tue Jun 18 21:29:16 2013
@@ -21,14 +21,14 @@
 
 #include "LoadPlugins.h"
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
 #include "qpid/Modules.h"
 #include "qpid/sys/Shlib.h"
+
 #include <string>
 #include <vector>
 
+#include "config.h"
+
 using std::vector;
 using std::string;
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message