diff options
| author | Gordon Sim <gsim@apache.org> | 2006-11-22 15:08:03 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2006-11-22 15:08:03 +0000 |
| commit | dd22996c515d00f8968e22cad596b6a93abc1b02 (patch) | |
| tree | b5585e9b88ea7ea25caf765a84ce87c60a073f6b /qpid/cpp/src | |
| parent | ee3d400a8ac78543c13958f3ea4f8f5f69057a1a (diff) | |
| download | qpid-python-dd22996c515d00f8968e22cad596b6a93abc1b02.tar.gz | |
Temporary fix to avoid type name clashes. Will very shortly move this definition of string into the qpid::framing namespace to avoid any pollution of the global namespace.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@478183 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/framing/amqp_types.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/framing/amqp_types.h b/qpid/cpp/src/qpid/framing/amqp_types.h index e576c79baf..a4725dcbc5 100644 --- a/qpid/cpp/src/qpid/framing/amqp_types.h +++ b/qpid/cpp/src/qpid/framing/amqp_types.h @@ -33,7 +33,6 @@ typedef unsigned __int64 u_int64_t; #ifndef AMQP_TYPES_H #define AMQP_TYPES_H - -typedef std::string string; +using std::string; #endif |