From 585d00517aab2ff172e0eb8ef13b749f4a4c2c59 Mon Sep 17 00:00:00 2001
From: Maxim Mamontov <faust.madf@gmail.com>
Date: Mon, 25 Jul 2011 20:58:20 +0300
Subject: [PATCH] Fix name collision

---
 projects/stargazer/plugins/other/smux/handlers.cpp | 2 +-
 projects/stargazer/plugins/other/smux/smux.cpp     | 2 +-
 projects/stargazer/plugins/other/smux/smux.h       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/stargazer/plugins/other/smux/handlers.cpp b/projects/stargazer/plugins/other/smux/handlers.cpp
index f0f3a8c1..5fb3dfda 100644
--- a/projects/stargazer/plugins/other/smux/handlers.cpp
+++ b/projects/stargazer/plugins/other/smux/handlers.cpp
@@ -27,7 +27,7 @@ asn_fprint(stderr, &asn_DEF_SMUX_PDUs, pdus);
 return false;
 }
 
-bool SMUX::PDUsHandler(const SMUX_PDUs_t * pdus)
+bool SMUX::PDUsRequestHandler(const SMUX_PDUs_t * pdus)
 {
 printfd(__FILE__, "SMUX::PDUsHandler()\n");
 asn_fprint(stderr, &asn_DEF_SMUX_PDUs, pdus);
diff --git a/projects/stargazer/plugins/other/smux/smux.cpp b/projects/stargazer/plugins/other/smux/smux.cpp
index 11fda6ed..01d9bb21 100644
--- a/projects/stargazer/plugins/other/smux/smux.cpp
+++ b/projects/stargazer/plugins/other/smux/smux.cpp
@@ -358,7 +358,7 @@ pthread_mutex_init(&mutex, NULL);
 
 smuxHandlers[SMUX_PDUs_PR_close] = &SMUX::CloseHandler;
 smuxHandlers[SMUX_PDUs_PR_registerResponse] = &SMUX::RegisterResponseHandler;
-smuxHandlers[SMUX_PDUs_PR_pdus] = &SMUX::PDUsHandler;
+smuxHandlers[SMUX_PDUs_PR_pdus] = &SMUX::PDUsRequestHandler;
 smuxHandlers[SMUX_PDUs_PR_commitOrRollback] = &SMUX::CommitOrRollbackHandler;
 
 pdusHandlers[PDUs_PR_get_request] = &SMUX::GetRequestHandler;
diff --git a/projects/stargazer/plugins/other/smux/smux.h b/projects/stargazer/plugins/other/smux/smux.h
index c5b94d4c..25b7ff4b 100644
--- a/projects/stargazer/plugins/other/smux/smux.h
+++ b/projects/stargazer/plugins/other/smux/smux.h
@@ -80,7 +80,7 @@ private:
 
     bool CloseHandler(const SMUX_PDUs_t * pdus);
     bool RegisterResponseHandler(const SMUX_PDUs_t * pdus);
-    bool PDUsHandler(const SMUX_PDUs_t * pdus);
+    bool PDUsRequestHandler(const SMUX_PDUs_t * pdus);
     bool CommitOrRollbackHandler(const SMUX_PDUs_t * pdus);
 
     bool GetRequestHandler(const PDUs_t * pdus);
-- 
2.44.2