diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-26 10:42:56 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-26 10:43:46 +0300 |
| commit | d49ced7e170d79b5462e01ff1ff92baa3d0b98b6 (patch) | |
| tree | 1cd7d191e289aca4f27cdf778889f50d8dbe826a | |
| parent | 6fd0fe261cd6465585adc81cb2cb96ec4c51ec34 (diff) | |
Fix Windows build
| -rwxr-xr-x | tools/CppunitTest_tools_test.mk | 4 | ||||
| -rw-r--r-- | tools/source/fsys/dirent.cxx | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/tools/CppunitTest_tools_test.mk b/tools/CppunitTest_tools_test.mk index 2d1e02e9abdb..665cb9d53e7d 100755 --- a/tools/CppunitTest_tools_test.mk +++ b/tools/CppunitTest_tools_test.mk @@ -46,6 +46,10 @@ $(eval $(call gb_CppunitTest_add_linked_libs,tools_test, \ $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_linked_static_libs,tools_test, \ + ooopathutils \ +)) + $(eval $(call gb_CppunitTest_set_include,tools_test,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/tools/inc) \ diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx index 18bcaebf9e11..796d746d27af 100644 --- a/tools/source/fsys/dirent.cxx +++ b/tools/source/fsys/dirent.cxx @@ -220,6 +220,7 @@ public: inline DirEntry* Top(); inline DirEntry* Bottom(); inline bool Empty(); + inline void Clear(); }; inline void DirEntryStack::Push( DirEntry *pEntry ) @@ -252,6 +253,11 @@ inline bool DirEntryStack::Empty() return maStack.empty(); } +inline void DirEntryStack::Clear() +{ + maStack.clear(); +} + //-------------------------------------------------------------------- DBG_NAME( DirEntry ); @@ -428,7 +434,7 @@ FSysError DirEntry::ImpParseOs2Name( const ByteString& rPfad, FSysPathStyle eSty } // liegt jetzt nichts mehr auf dem Stack? - if ( aStack.empty() ) + if ( aStack.Empty() ) aStack.Push( new DirEntry( aName, FSYS_FLAG_RELROOT, eStyle ) ); } } |