From 2484b02c83a511da810efdc8ebc0846bd9f0e672 Mon Sep 17 00:00:00 2001
From: Dwayne Boone <dwayne@zeroc.com>
Date: Wed, 18 Oct 2006 17:49:26 +0000
Subject: Bug 932

---
 cpp/src/slice2cpp/Gen.cpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'cpp/src/slice2cpp/Gen.cpp')

diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 997d58f3d27..d554a2e8307 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -20,6 +20,18 @@ using namespace std;
 using namespace Slice;
 using namespace IceUtil;
 
+static string
+getDeprecateSymbol(const ContainedPtr& p1, const ContainedPtr& p2)
+{
+    string deprecateMetadata, deprecateSymbol;
+    if(p1->findMetaData("deprecate", deprecateMetadata) ||
+       (p2 != 0 && p2->findMetaData("deprecate", deprecateMetadata)))
+    {
+	deprecateSymbol = "ICE_DEPRECATED_API ";
+    }
+    return deprecateSymbol;
+}
+
 Slice::Gen::Gen(const string& name, const string& base,	const string& headerExtension,
 	        const string& sourceExtension, const vector<string>& extraHeaders, const string& include,
 		const vector<string>& includePaths, const string& dllExport, const string& dir,
@@ -1830,11 +1842,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
 
     string thisPointer = fixKwd(scope.substr(0, scope.size() - 2)) + "*";
 
-    string deprecateMetadata, deprecateSymbol;
-    if(p->findMetaData("deprecate", deprecateMetadata) || cl->findMetaData("deprecate", deprecateMetadata))
-    {
-	deprecateSymbol = "ICE_DEPRECATED_API ";
-    }
+    string deprecateSymbol = getDeprecateSymbol(p, cl);
     H << sp << nl << deprecateSymbol << retS << ' ' << fixKwd(name) << spar << paramsDecl << epar;
     H << sb;
     H << nl;
@@ -3393,11 +3401,7 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p)
     bool isConst = (p->mode() == Operation::Nonmutating) || p->hasMetaData("cpp:const");
     bool amd = !cl->isLocal() && (cl->hasMetaData("amd") || p->hasMetaData("amd"));
 
-    string deprecateMetadata, deprecateSymbol;
-    if(p->findMetaData("deprecate", deprecateMetadata) || cl->findMetaData("deprecate", deprecateMetadata))
-    {
-	deprecateSymbol = "ICE_DEPRECATED_API ";
-    }
+    string deprecateSymbol = getDeprecateSymbol(p, cl);
 
     H << sp;
     if(!amd)
-- 
cgit v1.2.3