From 2970078e8a383be527c6a80c7fdd9b548e3895ca Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Tue, 12 Dec 2006 12:57:08 +0000 Subject: Renamed Content.h (and Content.cpp for consistency) in framing to avoid clashing with existing Content.h file. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@486119 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/lib/common/Makefile.am | 4 +-- cpp/lib/common/framing/Buffer.cpp | 2 +- cpp/lib/common/framing/Content.cpp | 41 --------------------------- cpp/lib/common/framing/Content.h | 47 ------------------------------- cpp/lib/common/framing/FramingContent.cpp | 41 +++++++++++++++++++++++++++ cpp/lib/common/framing/FramingContent.h | 47 +++++++++++++++++++++++++++++++ 6 files changed, 91 insertions(+), 91 deletions(-) delete mode 100644 cpp/lib/common/framing/Content.cpp delete mode 100644 cpp/lib/common/framing/Content.h create mode 100644 cpp/lib/common/framing/FramingContent.cpp create mode 100644 cpp/lib/common/framing/FramingContent.h (limited to 'cpp/lib') diff --git a/cpp/lib/common/Makefile.am b/cpp/lib/common/Makefile.am index 21eaf12ff2..6f21a332d4 100644 --- a/cpp/lib/common/Makefile.am +++ b/cpp/lib/common/Makefile.am @@ -71,10 +71,10 @@ libcommon_la_SOURCES = \ $(framing)/BodyHandler.h \ $(framing)/Buffer.cpp \ $(framing)/Buffer.h \ - $(framing)/Content.cpp \ - $(framing)/Content.h \ $(framing)/FieldTable.cpp \ $(framing)/FieldTable.h \ + $(framing)/FramingContent.cpp \ + $(framing)/FramingContent.h \ $(framing)/HeaderProperties.h \ $(framing)/InitiationHandler.cpp \ $(framing)/InitiationHandler.h \ diff --git a/cpp/lib/common/framing/Buffer.cpp b/cpp/lib/common/framing/Buffer.cpp index 77b000193a..43815c2f1d 100644 --- a/cpp/lib/common/framing/Buffer.cpp +++ b/cpp/lib/common/framing/Buffer.cpp @@ -19,7 +19,7 @@ * */ #include -#include +#include #include qpid::framing::Buffer::Buffer(u_int32_t _size) : size(_size), owner(true), position(0), limit(_size){ diff --git a/cpp/lib/common/framing/Content.cpp b/cpp/lib/common/framing/Content.cpp deleted file mode 100644 index cd8e144906..0000000000 --- a/cpp/lib/common/framing/Content.cpp +++ /dev/null @@ -1,41 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#include -#include - -namespace qpid -{ -namespace framing -{ - -Content::~Content() {} - -void Content::encode(Buffer&) const -{ -} - -void Content::decode(Buffer&) -{ -} - - -} // namespace framing -} // namespace qpid diff --git a/cpp/lib/common/framing/Content.h b/cpp/lib/common/framing/Content.h deleted file mode 100644 index 1ab3ba468b..0000000000 --- a/cpp/lib/common/framing/Content.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#ifndef _Content_ -#define _Content_ - -namespace qpid -{ -namespace framing -{ - -/* - * TODO: New Content class required for AMQP 0-9. This is a stub only. - */ -class Content -{ - public: - ~Content(); - - void encode(Buffer& buffer) const; - void decode(Buffer& buffer); - -}; - -} // namespace framing -} // namespace qpid - - -#endif diff --git a/cpp/lib/common/framing/FramingContent.cpp b/cpp/lib/common/framing/FramingContent.cpp new file mode 100644 index 0000000000..e5f50b5075 --- /dev/null +++ b/cpp/lib/common/framing/FramingContent.cpp @@ -0,0 +1,41 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +#include +#include + +namespace qpid +{ +namespace framing +{ + +Content::~Content() {} + +void Content::encode(Buffer&) const +{ +} + +void Content::decode(Buffer&) +{ +} + + +} // namespace framing +} // namespace qpid diff --git a/cpp/lib/common/framing/FramingContent.h b/cpp/lib/common/framing/FramingContent.h new file mode 100644 index 0000000000..1ab3ba468b --- /dev/null +++ b/cpp/lib/common/framing/FramingContent.h @@ -0,0 +1,47 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + +#ifndef _Content_ +#define _Content_ + +namespace qpid +{ +namespace framing +{ + +/* + * TODO: New Content class required for AMQP 0-9. This is a stub only. + */ +class Content +{ + public: + ~Content(); + + void encode(Buffer& buffer) const; + void decode(Buffer& buffer); + +}; + +} // namespace framing +} // namespace qpid + + +#endif -- cgit v1.2.1