summaryrefslogtreecommitdiff
path: root/comphelper
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2012-06-28 13:12:59 +0200
committerThomas Arnhold <thomas@arnhold.org>2012-06-29 09:25:10 +0200
commit4c4d748767c5740cc4b5348c69ad86c68db234bd (patch)
tree0dd2552859802f0554f83589cc02995eaa7c602e /comphelper
parent57154616f064752c237a278db18767241da13c3f (diff)
Remove some more include guards
Change-Id: I7c62d086cb593744785abecae7a107686a4d65ce
Diffstat (limited to 'comphelper')
-rw-r--r--comphelper/inc/comphelper/accessiblekeybindinghelper.hxx4
-rw-r--r--comphelper/inc/comphelper/sequence.hxx3
-rw-r--r--comphelper/inc/comphelper/sequenceashashmap.hxx3
3 files changed, 1 insertions, 9 deletions
diff --git a/comphelper/inc/comphelper/accessiblekeybindinghelper.hxx b/comphelper/inc/comphelper/accessiblekeybindinghelper.hxx
index 7fd51955144d..4849b124cf87 100644
--- a/comphelper/inc/comphelper/accessiblekeybindinghelper.hxx
+++ b/comphelper/inc/comphelper/accessiblekeybindinghelper.hxx
@@ -24,10 +24,8 @@
#include <cppuhelper/implbase1.hxx>
#include <osl/mutex.hxx>
-#ifndef INCLUDED_VECTOR
#include <vector>
-#define INCLUDED_VECTOR
-#endif
+
#include "comphelper/comphelperdllapi.h"
//..............................................................................
diff --git a/comphelper/inc/comphelper/sequence.hxx b/comphelper/inc/comphelper/sequence.hxx
index 46bffc5987d7..578948ea29a1 100644
--- a/comphelper/inc/comphelper/sequence.hxx
+++ b/comphelper/inc/comphelper/sequence.hxx
@@ -29,10 +29,7 @@
#ifndef _COMPHELPER_SEQUENCE_HXX_
#define _COMPHELPER_SEQUENCE_HXX_
-#ifndef INCLUDED_ALGORITHM
#include <algorithm> // copy algorithm
-#define INCLUDED_ALGORITHM
-#endif
#include <com/sun/star/uno/Sequence.hxx>
#include <osl/diagnose.h>
#include "comphelper/comphelperdllapi.h"
diff --git a/comphelper/inc/comphelper/sequenceashashmap.hxx b/comphelper/inc/comphelper/sequenceashashmap.hxx
index 2762d39156f8..425a78827ec7 100644
--- a/comphelper/inc/comphelper/sequenceashashmap.hxx
+++ b/comphelper/inc/comphelper/sequenceashashmap.hxx
@@ -34,10 +34,7 @@
#include <boost/unordered_map.hpp>
-#ifndef INCLUDED_ALGORITHM
#include <algorithm>
-#define INCLUDED_ALGORITHM
-#endif
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/NamedValue.hpp>