[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepimlibs/gpgme++
From:       Marc Mutz <mutz () kde ! org>
Date:       2010-12-06 14:05:41
Message-ID: 20101206140541.660B0AC8A8 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1204251 by mutz:

gpgme++: rename array to unbreak enable-final

 M  +3 -3      gpgagentgetinfoassuantransaction.cpp  
 M  +3 -3      scdgetinfoassuantransaction.cpp  


--- trunk/KDE/kdepimlibs/gpgme++/gpgagentgetinfoassuantransaction.cpp \
#1204250:1204251 @@ -73,20 +73,20 @@
         return std::string();
 }
 
-static const char * tokens[] = {
+static const char * gpgagent_getinfo_tokens[] = {
     "version",
     "pid",
     "socket_name",
     "ssh_socket_name",
     "scd_running",
 };
-BOOST_STATIC_ASSERT(( sizeof tokens / sizeof *tokens == \
GpgAgentGetInfoAssuanTransaction::LastInfoItem )); +BOOST_STATIC_ASSERT(( sizeof \
gpgagent_getinfo_tokens / sizeof *gpgagent_getinfo_tokens == \
GpgAgentGetInfoAssuanTransaction::LastInfoItem ));  
 void GpgAgentGetInfoAssuanTransaction::makeCommand() const {
     assert( m_item >= 0 );
     assert( m_item < LastInfoItem );
     m_command = "GETINFO ";
-    m_command += tokens[m_item];
+    m_command += gpgagent_getinfo_tokens[m_item];
 }
 
 const char * GpgAgentGetInfoAssuanTransaction::command() const {
--- trunk/KDE/kdepimlibs/gpgme++/scdgetinfoassuantransaction.cpp #1204250:1204251
@@ -107,7 +107,7 @@
         return std::vector<std::string>();
 }
 
-static const char * tokens[] = {
+static const char * scd_getinfo_tokens[] = {
     "version",
     "pid",
     "socket_name",
@@ -116,13 +116,13 @@
     "deny_admin",
     "app_list",
 };
-BOOST_STATIC_ASSERT(( sizeof tokens / sizeof *tokens == \
ScdGetInfoAssuanTransaction::LastInfoItem )); +BOOST_STATIC_ASSERT(( sizeof \
scd_getinfo_tokens / sizeof *scd_getinfo_tokens == \
ScdGetInfoAssuanTransaction::LastInfoItem ));  
 void ScdGetInfoAssuanTransaction::makeCommand() const {
     assert( m_item >= 0 );
     assert( m_item < LastInfoItem );
     m_command = "SCD GETINFO ";
-    m_command += tokens[m_item];
+    m_command += scd_getinfo_tokens[m_item];
 }
 
 const char * ScdGetInfoAssuanTransaction::command() const {


[prev in list] [next in list] [prev in thread] [next in thread]