Skip to content

Commit 0aac758

Browse files
committed
Compile with clang (needed some namespace and template annotations and reordering of includes)
git-svn-id: file:///Users/tack/GecodeGitMigration/gecode-svn-mirror/gecode/trunk@14442 e85b7adc-8362-4630-8c63-7469d557c915
1 parent fa98683 commit 0aac758

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

gecode/search/bab.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ namespace Gecode {
4949
template<class T>
5050
forceinline
5151
BAB<T>::BAB(T* s, const Search::Options& o)
52-
: EngineBase(Search::bab(s,o)) {}
52+
: Search::EngineBase<T>(Search::bab(s,o)) {}
5353

5454
template<class T>
5555
T*

gecode/search/dfs.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ namespace Gecode {
4545
template<class T>
4646
forceinline
4747
DFS<T>::DFS(T* s, const Search::Options& o)
48-
: EngineBase(Search::dfs(s,o)) {}
48+
: Search::EngineBase<T>(Search::dfs(s,o)) {}
4949

5050
template<class T>
5151
forceinline T*

gecode/search/meta/rbs.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
*/
3737

3838

39-
#include <gecode/search/meta/rbs.hh>
39+
#include <gecode/search.hh>
4040

4141
namespace Gecode { namespace Search { namespace Meta {
4242

gecode/search/rbs.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ namespace Gecode {
6767
slave->slave(cri);
6868
}
6969
E<T> engine(dynamic_cast<T*>(slave),e_opt);
70-
EngineBase* eb = &engine;
70+
Search::EngineBase<T>* eb = &engine;
7171
Search::Engine* ee = eb->e;
7272
eb->e = NULL;
7373
e = new Search::Meta::RBS(master,rs,ee,m_opt);

0 commit comments

Comments
 (0)