From 6e1582a62b461e389a7b65ca0053e3cc52f3dc27 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Wed, 22 Nov 2006 15:08:03 +0000 Subject: 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 --- cpp/src/qpid/framing/amqp_types.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'cpp/src') 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 -- cgit v1.2.1