diff options
| author | Xanadu <none@none> | 2010-07-20 02:49:28 +0200 |
|---|---|---|
| committer | Xanadu <none@none> | 2010-07-20 02:49:28 +0200 |
| commit | 79622802f397258ee0f34327ba3ae6977ca3e7ff (patch) | |
| tree | 1868946c234ab9ee256a6b7766a15713eae94235 /dep/include/ace/pre.h | |
| parent | 7dd2dc91816ab8b3bc3b99a1b1c99c7ea314d5a8 (diff) | |
| parent | f906976837502fa5aa81b982b901d1509f5aa0c4 (diff) | |
Merge. Revision history for source files should be all back now.
--HG--
branch : trunk
rename : sql/CMakeLists.txt => sql/tools/CMakeLists.txt
rename : src/server/game/Pools/PoolHandler.cpp => src/server/game/Pools/PoolMgr.cpp
rename : src/server/game/Pools/PoolHandler.h => src/server/game/Pools/PoolMgr.h
rename : src/server/game/PrecompiledHeaders/NixCorePCH.cpp => src/server/game/PrecompiledHeaders/gamePCH.cpp
rename : src/server/game/PrecompiledHeaders/NixCorePCH.h => src/server/game/PrecompiledHeaders/gamePCH.h
Diffstat (limited to 'dep/include/ace/pre.h')
| -rw-r--r-- | dep/include/ace/pre.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/dep/include/ace/pre.h b/dep/include/ace/pre.h deleted file mode 100644 index 6984b22804e..00000000000 --- a/dep/include/ace/pre.h +++ /dev/null @@ -1,26 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file pre.h - * - * $Id: pre.h 80826 2008-03-04 14:51:23Z wotte $ - * - * @author Christopher Kohlhoff <chris@kohlhoff.com> - * - * This file saves the original alignment rules and changes the alignment - * boundary to ACE's default. - */ -//============================================================================= - -// No header guard -#if defined (_MSC_VER) -# pragma warning (disable:4103) -# pragma warning (disable:4005) -# pragma pack (push, 8) -#elif defined (__BORLANDC__) -# pragma option push -a8 -b -Ve- -Vx- -w-rvl -w-rch -w-ccc -w-obs -w-aus -w-pia -w-inl -w-sig -# pragma nopushoptwarn -# pragma nopackwarning -#endif - |