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 | 6e1582a62b461e389a7b65ca0053e3cc52f3dc27 (patch) | |
| tree | e6d12b22ab4c2f6273278cbaf5c49e2516713490 /cpp/src | |
| parent | aadc46bac78c3f970c07768b2d91415d360217b7 (diff) | |
| download | qpid-python-6e1582a62b461e389a7b65ca0053e3cc52f3dc27.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/qpid@478183 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/qpid/framing/amqp_types.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/qpid/framing/amqp_types.h b/cpp/src/qpid/framing/amqp_types.h index e576c79baf..a4725dcbc5 100644 --- a/cpp/src/qpid/framing/amqp_types.h +++ b/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 |