Author: shuston
Date: Thu Sep 24 02:23:57 2009
New Revision: 818347
URL: http://svn.apache.org/viewvc?rev=818347&view=rev
Log:
Use struct/class consistently
Modified:
qpid/trunk/qpid/cpp/src/qmf/BrokerProxyImpl.h
qpid/trunk/qpid/cpp/src/qmf/ConsoleEngine.h
qpid/trunk/qpid/cpp/src/qmf/Object.h
qpid/trunk/qpid/cpp/src/qmf/ObjectId.h
qpid/trunk/qpid/cpp/src/qmf/Query.h
qpid/trunk/qpid/cpp/src/qmf/Schema.h
qpid/trunk/qpid/cpp/src/qmf/Value.h
Modified: qpid/trunk/qpid/cpp/src/qmf/BrokerProxyImpl.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/BrokerProxyImpl.h?rev=818347&r1=818346&r2=818347&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/BrokerProxyImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qmf/BrokerProxyImpl.h Thu Sep 24 02:23:57 2009
@@ -135,9 +135,9 @@
void staticRelease() { decOutstanding(); }
private:
- friend class StaticContext;
- friend class QueryContext;
- friend class MethodContext;
+ friend struct StaticContext;
+ friend struct QueryContext;
+ friend struct MethodContext;
BrokerProxy& publicObject;
mutable qpid::sys::Mutex lock;
ConsoleEngine& console;
Modified: qpid/trunk/qpid/cpp/src/qmf/ConsoleEngine.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/ConsoleEngine.h?rev=818347&r1=818346&r2=818347&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/ConsoleEngine.h (original)
+++ qpid/trunk/qpid/cpp/src/qmf/ConsoleEngine.h Thu Sep 24 02:23:57 2009
@@ -32,13 +32,13 @@
namespace qmf {
class ConsoleEngine;
- class ConsoleEngineImpl;
+ struct ConsoleEngineImpl;
class BrokerProxyImpl;
class AgentProxy;
- class AgentProxyImpl;
- class MethodResponseImpl;
- class QueryResponseImpl;
- class QueryContext;
+ struct AgentProxyImpl;
+ struct MethodResponseImpl;
+ struct QueryResponseImpl;
+ struct QueryContext;
/**
*
@@ -52,8 +52,8 @@
const Value* getArgs() const;
private:
- friend class MethodResponseImpl;
- friend class ConsoleEngineImpl;
+ friend struct MethodResponseImpl;
+ friend struct ConsoleEngineImpl;
MethodResponse(MethodResponseImpl* impl);
MethodResponseImpl* impl;
};
@@ -70,8 +70,8 @@
const Object* getObject(uint32_t idx) const;
private:
- friend class QueryResponseImpl;
- friend class QueryContext;
+ friend struct QueryResponseImpl;
+ friend struct QueryContext;
QueryResponse(QueryResponseImpl* impl);
QueryResponseImpl *impl;
};
@@ -135,7 +135,7 @@
const char* getLabel() const;
private:
- friend class AgentProxyImpl;
+ friend struct AgentProxyImpl;
friend class BrokerProxyImpl;
AgentProxy(AgentProxyImpl* impl);
AgentProxyImpl* impl;
@@ -165,8 +165,8 @@
void sendQuery(const Query& query, void* context, const AgentProxy*
agent = 0);
private:
- friend class ConsoleEngineImpl;
- friend class StaticContext;
+ friend struct ConsoleEngineImpl;
+ friend struct StaticContext;
BrokerProxyImpl* impl;
};
@@ -217,7 +217,7 @@
private:
friend class BrokerProxyImpl;
- friend class AgentProxyImpl;
+ friend struct AgentProxyImpl;
ConsoleEngineImpl* impl;
};
}
Modified: qpid/trunk/qpid/cpp/src/qmf/Object.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/Object.h?rev=818347&r1=818346&r2=818347&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/Object.h (original)
+++ qpid/trunk/qpid/cpp/src/qmf/Object.h Thu Sep 24 02:23:57 2009
@@ -43,8 +43,8 @@
void merge(const Object& from);
private:
- friend class ObjectImpl;
- friend class AgentEngineImpl;
+ friend struct ObjectImpl;
+ friend class AgentEngineImpl;
Object(ObjectImpl* impl);
ObjectImpl* impl;
};
Modified: qpid/trunk/qpid/cpp/src/qmf/ObjectId.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/ObjectId.h?rev=818347&r1=818346&r2=818347&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/ObjectId.h (original)
+++ qpid/trunk/qpid/cpp/src/qmf/ObjectId.h Thu Sep 24 02:23:57 2009
@@ -45,12 +45,12 @@
bool operator>=(const ObjectId& other) const;
private:
- friend class ObjectIdImpl;
- friend class ObjectImpl;
- friend class BrokerProxyImpl;
- friend class QueryImpl;
- friend class ValueImpl;
- friend class AgentEngineImpl;
+ friend struct ObjectIdImpl;
+ friend struct ObjectImpl;
+ friend class BrokerProxyImpl;
+ friend struct QueryImpl;
+ friend struct ValueImpl;
+ friend class AgentEngineImpl;
ObjectId(ObjectIdImpl* impl);
ObjectIdImpl* impl;
};
Modified: qpid/trunk/qpid/cpp/src/qmf/Query.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/Query.h?rev=818347&r1=818346&r2=818347&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/Query.h (original)
+++ qpid/trunk/qpid/cpp/src/qmf/Query.h Thu Sep 24 02:23:57 2009
@@ -25,11 +25,11 @@
namespace qmf {
- struct Object;
+ class Object;
struct QueryElementImpl;
struct QueryImpl;
struct QueryExpressionImpl;
- struct SchemaClassKey;
+ class SchemaClassKey;
enum ValueOper {
O_EQ = 1,
@@ -97,7 +97,7 @@
bool getDecreasing() const;
private:
- friend class QueryImpl;
+ friend struct QueryImpl;
friend class BrokerProxyImpl;
Query(QueryImpl* impl);
QueryImpl* impl;
Modified: qpid/trunk/qpid/cpp/src/qmf/Schema.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/Schema.h?rev=818347&r1=818346&r2=818347&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/Schema.h (original)
+++ qpid/trunk/qpid/cpp/src/qmf/Schema.h Thu Sep 24 02:23:57 2009
@@ -54,9 +54,9 @@
const char* getDesc() const;
private:
- friend class SchemaArgumentImpl;
- friend class SchemaMethodImpl;
- friend class SchemaEventClassImpl;
+ friend struct SchemaArgumentImpl;
+ friend struct SchemaMethodImpl;
+ friend struct SchemaEventClassImpl;
SchemaArgument(SchemaArgumentImpl* impl);
SchemaArgumentImpl* impl;
};
@@ -76,9 +76,9 @@
const SchemaArgument* getArgument(int idx) const;
private:
- friend class SchemaMethodImpl;
- friend class SchemaObjectClassImpl;
- friend class AgentEngineImpl;
+ friend struct SchemaMethodImpl;
+ friend struct SchemaObjectClassImpl;
+ friend class AgentEngineImpl;
SchemaMethod(SchemaMethodImpl* impl);
SchemaMethodImpl* impl;
};
@@ -104,8 +104,8 @@
const char* getDesc() const;
private:
- friend class SchemaPropertyImpl;
- friend class SchemaObjectClassImpl;
+ friend struct SchemaPropertyImpl;
+ friend struct SchemaObjectClassImpl;
SchemaProperty(SchemaPropertyImpl* impl);
SchemaPropertyImpl* impl;
};
@@ -125,8 +125,8 @@
const char* getDesc() const;
private:
- friend class SchemaStatisticImpl;
- friend class SchemaObjectClassImpl;
+ friend struct SchemaStatisticImpl;
+ friend struct SchemaObjectClassImpl;
SchemaStatistic(SchemaStatisticImpl* impl);
SchemaStatisticImpl* impl;
};
@@ -146,9 +146,9 @@
bool operator<(const SchemaClassKey& other) const;
private:
- friend class SchemaClassKeyImpl;
+ friend struct SchemaClassKeyImpl;
friend class BrokerProxyImpl;
- friend class ConsoleEngineImpl;
+ friend struct ConsoleEngineImpl;
SchemaClassKey(SchemaClassKeyImpl* impl);
SchemaClassKeyImpl* impl;
};
@@ -173,9 +173,9 @@
const SchemaMethod* getMethod(int idx) const;
private:
- friend class SchemaObjectClassImpl;
- friend class BrokerProxyImpl;
- friend class AgentEngineImpl;
+ friend struct SchemaObjectClassImpl;
+ friend class BrokerProxyImpl;
+ friend class AgentEngineImpl;
SchemaObjectClass(SchemaObjectClassImpl* impl);
SchemaObjectClassImpl* impl;
};
@@ -195,9 +195,9 @@
const SchemaArgument* getArgument(int idx) const;
private:
- friend class SchemaEventClassImpl;
- friend class BrokerProxyImpl;
- friend class AgentEngineImpl;
+ friend struct SchemaEventClassImpl;
+ friend class BrokerProxyImpl;
+ friend class AgentEngineImpl;
SchemaEventClass(SchemaEventClassImpl* impl);
SchemaEventClassImpl* impl;
};
Modified: qpid/trunk/qpid/cpp/src/qmf/Value.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/Value.h?rev=818347&r1=818346&r2=818347&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/Value.h (original)
+++ qpid/trunk/qpid/cpp/src/qmf/Value.h Thu Sep 24 02:23:57 2009
@@ -106,10 +106,10 @@
void deleteArrayItem(uint32_t idx);
private:
- friend class ValueImpl;
- friend class BrokerProxyImpl;
- friend class ObjectImpl;
- friend class AgentEngineImpl;
+ friend struct ValueImpl;
+ friend class BrokerProxyImpl;
+ friend struct ObjectImpl;
+ friend class AgentEngineImpl;
Value(ValueImpl* impl);
ValueImpl* impl;
};
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
