You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by sh...@apache.org on 2008/10/02 22:12:39 UTC
svn commit: r701231 - in /incubator/qpid/trunk/qpid/cpp/src: ./
qpid/amqp_0_10/ qpid/client/ qpid/framing/ qpid/sys/ qpid/sys/posix/
qpid/sys/windows/
Author: shuston
Date: Thu Oct 2 13:12:38 2008
New Revision: 701231
URL: http://svn.apache.org/viewvc?rev=701231&view=rev
Log:
Resolve QPID-1311
Added:
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/IntegerTypes.h (with props)
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/IntegerTypes.h (with props)
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/IntegerTypes.h (with props)
Modified:
incubator/qpid/trunk/qpid/cpp/src/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/built_in_types.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/amqp_types.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ProtocolFactory.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Time.h
Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?rev=701231&r1=701230&r2=701231&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Thu Oct 2 13:12:38 2008
@@ -86,7 +86,8 @@
qpid/sys/posix/Mutex.h \
qpid/sys/posix/Fork.h \
qpid/sys/posix/LockFile.h \
- qpid/sys/posix/PollableCondition.h
+ qpid/sys/posix/PollableCondition.h \
+ qpid/sys/posix/IntegerTypes.h
if HAVE_EPOLL
poller = qpid/sys/epoll/EpollPoller.cpp
@@ -268,6 +269,7 @@
qpid/sys/AggregateOutput.cpp \
qpid/sys/AsynchIOHandler.cpp \
qpid/sys/Dispatcher.cpp \
+ qpid/sys/IntegerTypes.h \
qpid/sys/PollableCondition.h \
qpid/sys/PollableQueue.h \
qpid/sys/Runnable.cpp \
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/built_in_types.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/built_in_types.h?rev=701231&r1=701230&r2=701231&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/built_in_types.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/built_in_types.h Thu Oct 2 13:12:38 2008
@@ -23,6 +23,7 @@
#include "qpid/Serializer.h"
#include "qpid/framing/Uuid.h"
+#include "qpid/sys/IntegerTypes.h"
#include "qpid/sys/Time.h"
#include "Decimal.h"
#include "SerializableString.h"
@@ -31,7 +32,6 @@
#include <string>
#include <ostream>
#include <vector>
-#include <stdint.h>
/**@file Mapping from built-in AMQP types to C++ types */
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.cpp?rev=701231&r1=701230&r2=701231&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.cpp Thu Oct 2 13:12:38 2008
@@ -34,6 +34,7 @@
#include "qpid/framing/reply_exceptions.h"
#include "qpid/framing/DeliveryProperties.h"
#include "qpid/log/Statement.h"
+#include "qpid/sys/IntegerTypes.h"
#include <boost/bind.hpp>
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/amqp_types.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/amqp_types.h?rev=701231&r1=701230&r2=701231&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/amqp_types.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/amqp_types.h Thu Oct 2 13:12:38 2008
@@ -26,17 +26,8 @@
* in AMQP messages.
*/
+#include "qpid/sys/IntegerTypes.h"
#include <string>
-#ifdef _WINDOWS
-#include "windows.h"
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned __int64 uint64_t;
-#endif
-#ifndef _WINDOWS
-#include <stdint.h>
-#endif
namespace qpid {
namespace framing {
@@ -53,7 +44,7 @@
class Content;
class FieldTable;
class SequenceNumberSet;
-class Uuid;
+struct Uuid;
// Useful constants
@@ -66,7 +57,7 @@
class FieldTable;
class SequenceNumberSet;
class SequenceSet;
-class Uuid;
+struct Uuid;
}} // namespace qpid::framing
#endif
Added: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/IntegerTypes.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/IntegerTypes.h?rev=701231&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/IntegerTypes.h (added)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/IntegerTypes.h Thu Oct 2 13:12:38 2008
@@ -0,0 +1,31 @@
+#ifndef QPID_SYS_INTEGERTYPES_H
+#define QPID_SYS_INTEGERTYPES_H
+
+/*
+ * 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.
+ *
+ */
+
+#if (defined(_WINDOWS) || defined (WIN32)) && defined(_MSC_VER)
+#include "qpid/sys/windows/IntegerTypes.h"
+#endif
+#if !defined _WINDOWS && !defined WIN32
+#include "qpid/sys/posix/IntegerTypes.h"
+#endif
+
+#endif /*!QPID_SYS_INTEGERTYPES_H*/
Propchange: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/IntegerTypes.h
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ProtocolFactory.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ProtocolFactory.h?rev=701231&r1=701230&r2=701231&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ProtocolFactory.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ProtocolFactory.h Thu Oct 2 13:12:38 2008
@@ -22,7 +22,7 @@
*
*/
-#include <stdint.h>
+#include "qpid/sys/IntegerTypes.h"
#include "qpid/SharedObject.h"
#include "ConnectionCodec.h"
#include <boost/function.hpp>
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h?rev=701231&r1=701230&r2=701231&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h Thu Oct 2 13:12:38 2008
@@ -23,6 +23,7 @@
*/
#include "IOHandle.h"
+#include "qpid/sys/IntegerTypes.h"
#include <string>
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Time.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Time.h?rev=701231&r1=701230&r2=701231&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Time.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Time.h Thu Oct 2 13:12:38 2008
@@ -22,7 +22,7 @@
*
*/
-#include <stdint.h>
+#include "qpid/sys/IntegerTypes.h"
#include <limits>
#include <iosfwd>
Added: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/IntegerTypes.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/IntegerTypes.h?rev=701231&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/IntegerTypes.h (added)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/IntegerTypes.h Thu Oct 2 13:12:38 2008
@@ -0,0 +1,26 @@
+#ifndef QPID_SYS_POSIX_INTEGERTYPES_H
+#define QPID_SYS_POSIX_INTEGERTYPES_H
+
+/*
+ * 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 <stdint.h>
+
+#endif /*!QPID_SYS_INTEGERTYPES_H*/
Propchange: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/IntegerTypes.h
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/IntegerTypes.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/IntegerTypes.h?rev=701231&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/IntegerTypes.h (added)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/IntegerTypes.h Thu Oct 2 13:12:38 2008
@@ -0,0 +1,40 @@
+#ifndef QPID_SYS_WINDOWS_INTEGERTYPES_H
+#define QPID_SYS_WINDOWS_INTEGERTYPES_H
+
+/*
+ * 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.
+ *
+ */
+
+typedef unsigned char uint8_t;
+typedef char int8_t;
+typedef unsigned short uint16_t;
+typedef short int16_t;
+typedef unsigned int uint32_t;
+typedef int int32_t;
+typedef unsigned __int64 uint64_t;
+typedef __int64 int64_t;
+
+// Visual Studio doesn't define other common types, so set them up here too.
+typedef int pid_t;
+typedef int socklen_t;
+typedef unsigned int size_t;
+typedef int ssize_t;
+typedef unsigned int uint;
+
+#endif /*!QPID_SYS_WINDOWS_INTEGERTYPES_H*/
Propchange: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/IntegerTypes.h
------------------------------------------------------------------------------
svn:executable = *