Skip to content

Commit d9771fc

Browse files
author
Stephan Gerth
authored
Merge pull request #114 from SchulzSt/release
Update master branch with release branch fixes
2 parents 9442699 + 160188b commit d9771fc

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
## --------------------------------------------------------------------------
33
##
44
## Copyright 2014 Université Pierre et Marie Curie, Paris
5-
## Copyright 2014 Fraunhofer-Gesellschaft zur Foerderung
5+
## Copyright 2014-2017 Fraunhofer-Gesellschaft zur Foerderung
66
## der angewandten Forschung e.V.
77
## Copyright 2007-2011 Mentor Graphics Corporation
88
## Copyright 2007-2011 Cadence Design Systems, Inc.
@@ -56,7 +56,7 @@ AC_DEFINE_UNQUOTED(CONFIGURE_DATE, "`sh -c date`", [Date of configure])
5656
AC_SUBST(CONFIGURE_DATE)
5757

5858
AC_DEFINE_UNQUOTED(UVM_VERSION, "${PACKAGE_VERSION}", [UVM SystemC Version])
59-
AC_DEFINE_UNQUOTED(UVM_RELEASE_DATE, "2015-12-04", [UVM SystemC Release Date])
59+
AC_DEFINE_UNQUOTED(UVM_RELEASE_DATE, "2017-11-30", [UVM SystemC Release Date])
6060
AC_SUBST(UVM_VERSION)
6161
AC_SUBST(UVM_RELEASE_DATE)
6262

src/uvmsc/base/uvm_default_coreservice_t.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class uvm_default_coreservice_t : public uvm_coreservice_t
6363
// virtual uvm_visitor<uvm_component> get_component_visitor() const;
6464

6565
private:
66-
uvm_default_coreservice_t(){};
66+
uvm_default_coreservice_t():factory(NULL),report_server(NULL){};
6767
virtual ~uvm_default_coreservice_t(){};
6868

6969
mutable uvm_factory* factory;

src/uvmsc/base/uvm_root.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//----------------------------------------------------------------------
22
// Copyright 2012-2016 NXP B.V.
3-
// Copyright 2014 Fraunhofer-Gesellschaft zur Foerderung
3+
// Copyright 2014-2017 Fraunhofer-Gesellschaft zur Foerderung
44
// der angewandten Forschung e.V.
55
// Copyright 2007-2011 Mentor Graphics Corporation
66
// Copyright 2007-2011 Cadence Design Systems, Inc.
@@ -548,7 +548,7 @@ void uvm_root::m_uvm_header()
548548
<< std::endl
549549
<< " Version: " << UVM_VERSION << " Date: " << UVM_RELEASE_DATE << std::endl;
550550
std::cerr
551-
<< " Copyright (c) 2006 - 2015 by all Contributors" << std::endl
551+
<< " Copyright (c) 2006 - 2017 by all Contributors" << std::endl
552552
<< " See NOTICE file for all Contributors" << std::endl
553553
<< " ALL RIGHTS RESERVED" << std::endl;
554554
std::cerr

0 commit comments

Comments
 (0)