diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-05-29 06:59:19 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-05-29 06:59:19 +0000 |
commit | dae67a6a82b3a50719cfdce75e02ebd6ac5d1c86 (patch) | |
tree | 59aa090df93948b77219f1e36bec495e22b02a83 | |
parent | 0c94f7d273f639854717e049045942e2907e767b (diff) | |
download | ATCD-dae67a6a82b3a50719cfdce75e02ebd6ac5d1c86.tar.gz |
Wed May 29 06:58:53 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/config-sunos5.7.h:
Fixed possible redefinition warning
* docs/ACE-development-process.html:
Extended bczar instructions, updated link
* tests/Compiler_Features_20_DLL.h:
* tests/Compiler_Features_20_DLL.cpp:
* tests/Compiler_Features_20_DLL_Export.h:
* tests/tests.mpc:
New C++11 compiler feature test
-rw-r--r-- | ACE/ChangeLog | 14 | ||||
-rw-r--r-- | ACE/ace/config-sunos5.7.h | 4 | ||||
-rw-r--r-- | ACE/docs/ACE-development-process.html | 16 | ||||
-rw-r--r-- | ACE/tests/Compiler_Features_20_DLL.cpp | 10 | ||||
-rw-r--r-- | ACE/tests/Compiler_Features_20_DLL.h | 30 | ||||
-rw-r--r-- | ACE/tests/Compiler_Features_20_DLL_Export.h | 54 | ||||
-rw-r--r-- | ACE/tests/tests.mpc | 18 |
7 files changed, 136 insertions, 10 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 007d136a4b1..32ed9332afa 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,17 @@ +Wed May 29 06:58:53 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-sunos5.7.h: + Fixed possible redefinition warning + + * docs/ACE-development-process.html: + Extended bczar instructions, updated link + + * tests/Compiler_Features_20_DLL.h: + * tests/Compiler_Features_20_DLL.cpp: + * tests/Compiler_Features_20_DLL_Export.h: + * tests/tests.mpc: + New C++11 compiler feature test + Tue May 28 09:12:20 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> * docs/Download.html: diff --git a/ACE/ace/config-sunos5.7.h b/ACE/ace/config-sunos5.7.h index 38476485251..c2001b07093 100644 --- a/ACE/ace/config-sunos5.7.h +++ b/ACE/ace/config-sunos5.7.h @@ -51,7 +51,9 @@ #define ACE_HAS_SOCKLEN_T #if defined (__sparcv9) -#define _LP64 +#if !defined (_LP64) +# define _LP64 +#endif /* _LP64 */ #define ACE_SIZEOF_LONG 8 /* Needed to circumvent compiler bug #4294969 */ #endif /* __sparcv9 */ diff --git a/ACE/docs/ACE-development-process.html b/ACE/docs/ACE-development-process.html index fb4ad9f2700..e964c1a4037 100644 --- a/ACE/docs/ACE-development-process.html +++ b/ACE/docs/ACE-development-process.html @@ -101,15 +101,15 @@ A bug should typically follow this life cycle:<p> At all times, we'll have a build czar. The role may be shared by multiple people. The build czar is responsible for ensuring that the next kits are clean, <em>i.e.</em>, it builds and runs cleanly on all -platforms. The status of all ACE+TAO builds is tracked automatically -<A HREF="http://tao.doc.wustl.edu/scoreboard/"</A>online</A>.<p> +platforms. The status of all ACE+TAO+CIAO+DAnCE builds is tracked automatically +<A HREF="www.dre.vanderbilt.edu/scoreboard"</A>online</A>.<p> A comprehensive summary of the build czar's role is available <A HREF="bczar/bczar.html">here</A>. This role is briefly summarized below:<p> <ul> <li>Remind people to check build logs. Developers are still responsible for verifying that their changes are clean. - <li>Fix minor problems caused by compilation errors. More complex + <li>Trigger other developers to fix problems caused by compilation errors. All problems should be fixed by the developers who caused them. The build czar should help track down the guilty parties. <li>Freeze the source repository when it's decided to no more @@ -131,22 +131,22 @@ violator. This is also intentional, desirable, beneficial, and the Right Thing[TM] to do.<p> <p><hr> -<H3>The ACE+TAO+CIAO Release Process</H3> +<H3>The ACE+TAO+CIAO+DAnCE Release Process</H3> <P> -Minor releases of ACE+TAO+CIAO occur periodically, typically twice a +Minor releases of ACE+TAO+CIAO+DAnCE occur periodically, typically twice a year. Minor releases have two-digit numbers, <EM>e.g.,</EM> 5.3. Major releases are released infrequently, typically once a year. Major releases are 1-digit numbers, <EM>e.g.,</EM>5, that include substantially new functionality. Both major and minor releases are carefully tested on all platforms the ACE+TAO run on. In particular, -we do not put out major or minor releases of ACE+TAO+CIAO until all the +we do not put out major or minor releases of ACE+TAO+CIAO+DAnCE until all the compilations and regression tests work successful on all the platform we support. <P> Between major/minor releases, we release micro releases periodically, -<EM>e.g.,</EM> 3-4 times per year, so that ACE+TAO+CIAO users can -download and test our latest work in progress. ACE+TAO+CIAO micro +<EM>e.g.,</EM> 3-4 times per year, so that ACE+TAO+CIAO+DAnCE users can +download and test our latest work in progress. ACE+TAO+CIAO+DAnCE micro release kits have three-digit numbers, <EM>e.g.,</EM> 5.3.1. Micro releases often contain important fixes that aren't in the major/minor releases and will compile cleanly and pass most tests on most diff --git a/ACE/tests/Compiler_Features_20_DLL.cpp b/ACE/tests/Compiler_Features_20_DLL.cpp new file mode 100644 index 00000000000..053a9788c30 --- /dev/null +++ b/ACE/tests/Compiler_Features_20_DLL.cpp @@ -0,0 +1,10 @@ + +//============================================================================= +/** + * $Id$ + */ +//============================================================================= + + +#include "Compiler_Features_20_DLL.h" + diff --git a/ACE/tests/Compiler_Features_20_DLL.h b/ACE/tests/Compiler_Features_20_DLL.h new file mode 100644 index 00000000000..fd9bc905b29 --- /dev/null +++ b/ACE/tests/Compiler_Features_20_DLL.h @@ -0,0 +1,30 @@ + +//============================================================================= +/** + * @file Compile_Features_20_DLL.h + * + * $Id$ + * + * Test DLL export with default constructor + */ +//============================================================================= + + +#ifndef ACE_TESTS_COMPILER_FEATURES_20_DLL_H +#define ACE_TESTS_COMPILER_FEATURES_20_DLL_H + +#include "test_config.h" + +#if defined (ACE_HAS_CPP11) + +#include "Compiler_Features_20_DLL_Export.h" + +class COMPILER_FEATURES_20_DLL_Export UtcT +{ +public: + ~UtcT (void) = default; +}; + +#endif + +#endif /* ACE_TESTS_COMPILER_FEATURES_20_DLL_H */ diff --git a/ACE/tests/Compiler_Features_20_DLL_Export.h b/ACE/tests/Compiler_Features_20_DLL_Export.h new file mode 100644 index 00000000000..7dae763c831 --- /dev/null +++ b/ACE/tests/Compiler_Features_20_DLL_Export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl COMPILER_FEATURES_20_DLL +// ------------------------------ +#ifndef COMPILER_FEATURES_20_DLL_EXPORT_H +#define COMPILER_FEATURES_20_DLL_EXPORT_H + +#include "ace/config-all.h" + +#if defined (ACE_AS_STATIC_LIBS) && !defined (COMPILER_FEATURES_20_DLL_HAS_DLL) +# define COMPILER_FEATURES_20_DLL_HAS_DLL 0 +#endif /* ACE_AS_STATIC_LIBS && ! TEST_HAS_DLL */ + +#if !defined (COMPILER_FEATURES_20_DLL_HAS_DLL) +# define COMPILER_FEATURES_20_DLL_HAS_DLL 1 +#endif /* ! COMPILER_FEATURES_20_DLL_HAS_DLL */ + +#if defined (COMPILER_FEATURES_20_DLL_HAS_DLL) && (COMPILER_FEATURES_20_DLL_HAS_DLL == 1) +# if defined (COMPILER_FEATURES_20_DLL_BUILD_DLL) +# define COMPILER_FEATURES_20_DLL_Export ACE_Proper_Export_Flag +# define COMPILER_FEATURES_20_DLL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define COMPILER_FEATURES_20_DLL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* COMPILER_FEATURES_20_DLL_BUILD_DLL */ +# define COMPILER_FEATURES_20_DLL_Export ACE_Proper_Import_Flag +# define COMPILER_FEATURES_20_DLL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define COMPILER_FEATURES_20_DLL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* COMPILER_FEATURES_20_DLL_BUILD_DLL */ +#else /* COMPILER_FEATURES_20_DLL_HAS_DLL == 1 */ +# define COMPILER_FEATURES_20_DLL_Export +# define COMPILER_FEATURES_20_DLL_SINGLETON_DECLARATION(T) +# define COMPILER_FEATURES_20_DLL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* COMPILER_FEATURES_20_DLL_HAS_DLL == 1 */ + +// Set COMPILER_FEATURES_20_DLL_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (COMPILER_FEATURES_20_DLL_NTRACE) +# if (ACE_NTRACE == 1) +# define COMPILER_FEATURES_20_DLL_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define COMPILER_FEATURES_20_DLL_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !COMPILER_FEATURES_20_DLL_NTRACE */ + +#if (COMPILER_FEATURES_20_DLL_NTRACE == 1) +# define COMPILER_FEATURES_20_DLL_TRACE(X) +#else /* (COMPILER_FEATURES_20_DLL_NTRACE == 1) */ +# define COMPILER_FEATURES_20_DLL_TRACE(X) ACE_TRACE_IMPL(X) +#endif /* (COMPILER_FEATURES_20_DLL_NTRACE == 1) */ + +#endif /* COMPILER_FEATURES_20_DLL_EXPORT_H */ + +// End of auto generated file. diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc index 704010d4130..c11c786c3d8 100644 --- a/ACE/tests/tests.mpc +++ b/ACE/tests/tests.mpc @@ -36,7 +36,6 @@ project(Framework Component DLL) : acelib { } } - project(DLL Test Parent Lib) : acelib { libout = . sharedname = DLL_Test_Parent @@ -680,6 +679,23 @@ project(Compiler_Features_19_Test) : acetest { } } +project(Compiler_Features_20_Test) : acelib { + libout = . + sharedname = Compiler_Features_20 + dynamicflags += COMPILER_FEATURES_20_DLL_BUILD_DLL + + Source_Files { + Compiler_Features_20_DLL.cpp + } + Header_Files { + Compiler_Features_20_DLL.h + Compiler_Features_20_DLL_Export.h + } + Resource_Files { + } +} + + project(Config Test) : acetest { avoids += ace_for_tao exename = Config_Test |