summaryrefslogtreecommitdiff
path: root/qpid/cpp
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2012-10-24 19:18:24 +0000
committerAndrew Stitcher <astitcher@apache.org>2012-10-24 19:18:24 +0000
commitdfa25521851fbc4dcd42a702aea8ee8919af63c6 (patch)
tree80033c01506fc7781636db737ab5ba742de6abed /qpid/cpp
parent7f49961eb9ae919ccc0856f8b3df3c423b798b79 (diff)
downloadqpid-python-dfa25521851fbc4dcd42a702aea8ee8919af63c6.tar.gz
NO-JIRA: removed all remaining traces of unused alloca.h
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1401831 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
-rw-r--r--qpid/cpp/src/Makefile.am1
-rw-r--r--qpid/cpp/src/qpid/sys/alloca.h42
-rw-r--r--qpid/cpp/src/tests/FieldTable.cpp1
3 files changed, 0 insertions, 44 deletions
diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am
index 488eb37eb0..3782c17c78 100644
--- a/qpid/cpp/src/Makefile.am
+++ b/qpid/cpp/src/Makefile.am
@@ -512,7 +512,6 @@ libqpidcommon_la_SOURCES += \
qpid/sys/TimerWarnings.cpp \
qpid/sys/TimerWarnings.h \
qpid/sys/Waitable.h \
- qpid/sys/alloca.h \
qpid/sys/uuid.h \
qpid/sys/unordered_map.h \
qpid/amqp_0_10/Codecs.cpp \
diff --git a/qpid/cpp/src/qpid/sys/alloca.h b/qpid/cpp/src/qpid/sys/alloca.h
deleted file mode 100644
index b3f59b7c3f..0000000000
--- a/qpid/cpp/src/qpid/sys/alloca.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef QPID_SYS_ALLOCA_H
-#define QPID_SYS_ALLOCA_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))
-# include <malloc.h>
-
-# if defined(_MSC_VER)
-# ifdef alloc
-# undef alloc
-# endif
-# define alloc _alloc
-# ifdef alloca
-# undef alloca
-# endif
-# define alloca _alloca
-# endif
-#endif
-#if !defined _WINDOWS && !defined WIN32
-# include <alloca.h>
-#endif
-
-#endif /*!QPID_SYS_ALLOCA_H*/
diff --git a/qpid/cpp/src/tests/FieldTable.cpp b/qpid/cpp/src/tests/FieldTable.cpp
index 8aeeb031b3..81372d87c5 100644
--- a/qpid/cpp/src/tests/FieldTable.cpp
+++ b/qpid/cpp/src/tests/FieldTable.cpp
@@ -20,7 +20,6 @@
*/
#include <iostream>
#include <algorithm>
-#include "qpid/sys/alloca.h"
#include "qpid/framing/Array.h"
#include "qpid/framing/FieldTable.h"
#include "qpid/framing/FieldValue.h"