From 0a103a150a50c5e233f29b69db79cac884925e58 Mon Sep 17 00:00:00 2001
From: Andrew Stitcher <astitcher@apache.org>
Date: Mon, 9 May 2011 19:56:11 +0000
Subject: QPID-3004: Get Clang to compile qpid c++ - Add new template function
 for FieldValue::getIntegerValue() to avoid   compile error when extracting
 into 1 byte ints.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1101183 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/amqp_0_10/Codecs.cpp           | 6 +++---
 cpp/src/qpid/management/ManagementAgent.cpp | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'cpp/src')

diff --git a/cpp/src/qpid/amqp_0_10/Codecs.cpp b/cpp/src/qpid/amqp_0_10/Codecs.cpp
index 0fbe2a60b9..b976a5d09b 100644
--- a/cpp/src/qpid/amqp_0_10/Codecs.cpp
+++ b/cpp/src/qpid/amqp_0_10/Codecs.cpp
@@ -127,10 +127,10 @@ Variant toVariant(boost::shared_ptr<FieldValue> in)
     switch (in->getType()) {
         //Fixed Width types:
       case 0x01: out.setEncoding(amqp0_10_binary);
-      case 0x02: out = in->getIntegerValue<int8_t, 1>(); break;
-      case 0x03: out = in->getIntegerValue<uint8_t, 1>(); break;
+      case 0x02: out = in->getIntegerValue<int8_t>(); break;
+      case 0x03: out = in->getIntegerValue<uint8_t>(); break;
       case 0x04: break; //TODO: iso-8859-15 char
-      case 0x08: out = static_cast<bool>(in->getIntegerValue<uint8_t, 1>()); break;
+      case 0x08: out = static_cast<bool>(in->getIntegerValue<uint8_t>()); break;
       case 0x10: out.setEncoding(amqp0_10_binary);
       case 0x11: out = in->getIntegerValue<int16_t, 2>(); break;
       case 0x12: out = in->getIntegerValue<uint16_t, 2>(); break;
diff --git a/cpp/src/qpid/management/ManagementAgent.cpp b/cpp/src/qpid/management/ManagementAgent.cpp
index 7c9771fe79..8a12a57fa6 100644
--- a/cpp/src/qpid/management/ManagementAgent.cpp
+++ b/cpp/src/qpid/management/ManagementAgent.cpp
@@ -2861,10 +2861,10 @@ Variant ManagementAgent::toVariant(const boost::shared_ptr<FieldValue>& in)
         //Fixed Width types:
     case 0x00: //bin8
     case 0x01: out.setEncoding(amqp0_10_binary); // int8
-    case 0x02: out = in->getIntegerValue<int8_t, 1>(); break;  //uint8
-    case 0x03: out = in->getIntegerValue<uint8_t, 1>(); break;  // 
+    case 0x02: out = in->getIntegerValue<int8_t>(); break;  //uint8
+    case 0x03: out = in->getIntegerValue<uint8_t>(); break;  // 
         // case 0x04: break; //TODO: iso-8859-15 char  // char
-    case 0x08: out = static_cast<bool>(in->getIntegerValue<uint8_t, 1>()); break;  // bool int8
+    case 0x08: out = static_cast<bool>(in->getIntegerValue<uint8_t>()); break;  // bool int8
 
     case 0x10: out.setEncoding(amqp0_10_binary);  // bin16
     case 0x11: out = in->getIntegerValue<int16_t, 2>(); break;  // int16
-- 
cgit v1.2.1