You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2010/03/17 19:49:56 UTC
svn commit: r924418 - in /qpid/trunk/qpid/cpp/src/qpid: Version.h
Version.h.in
Author: astitcher
Date: Wed Mar 17 18:49:56 2010
New Revision: 924418
URL: http://svn.apache.org/viewvc?rev=924418&view=rev
Log:
Fixed previous broken change which attempted to get version at configuration time.
Added:
qpid/trunk/qpid/cpp/src/qpid/Version.h
- copied, changed from r924359, qpid/trunk/qpid/cpp/src/qpid/Version.h.in
Removed:
qpid/trunk/qpid/cpp/src/qpid/Version.h.in
Copied: qpid/trunk/qpid/cpp/src/qpid/Version.h (from r924359, qpid/trunk/qpid/cpp/src/qpid/Version.h.in)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/Version.h?p2=qpid/trunk/qpid/cpp/src/qpid/Version.h&p1=qpid/trunk/qpid/cpp/src/qpid/Version.h.in&r1=924359&r2=924418&rev=924418&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/Version.h.in (original)
+++ qpid/trunk/qpid/cpp/src/qpid/Version.h Wed Mar 17 18:49:56 2010
@@ -23,10 +23,11 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
+#else
+# error "config.h not generated"
#endif
namespace qpid {
-#ifdef HAVE_CONFIG_H
const std::string product = PACKAGE_NAME;
const std::string version = PACKAGE_VERSION;
# if HAVE_SASL
@@ -34,11 +35,6 @@ namespace qpid {
# else
const std::string saslName = "qpidd-no-sasl";
# endif
-#else
- const std::string product = "qpidc";
- const std::string version = "@VERSION@";
- const std::string saslName = "qpid-broker";
-#endif
}
#endif /*!QPID_VERSION_H*/
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org